Fix widevine install prompt is shown after using new profiles

.github/CODEOWNERS

@@ -31,6 +31,9 @@ vendor/bat-native-ledger/src/bat/ledger/internal/static_values.h @gdregalo
 # Network
 browser/net/ @iefremov
 
+# Widevine
+browser/widevine @simonhong
+
 # Licensing of third-party components
 common/licenses/ @fmarier
 components/brave_new_tab_ui/data/backgrounds.ts @fmarier

browser/BUILD.gn

@@ -43,8 +43,6 @@ source_set("browser_process") {
     "brave_browser_process_impl.h",
     "brave_content_browser_client.cc",
     "brave_content_browser_client.h",
-    "brave_drm_tab_helper.cc",
-    "brave_drm_tab_helper.h",
     "brave_local_state_prefs.cc",
     "brave_local_state_prefs.h",
     "brave_profile_prefs.cc",
@@ -161,6 +159,7 @@ source_set("browser_process") {
     "themes",
     "//services/network/public/cpp",
     "//services/service_manager/embedder",
+    "//third_party/widevine/cdm:buildflags",
     "//ui/base",
   ]
 
@@ -253,11 +252,12 @@ source_set("browser_process") {
     ]
   }
 
-  if (bundle_widevine_cdm || enable_widevine_cdm_component) {
-    deps += [
-      "//brave/browser/widevine",
-      "//third_party/widevine/cdm:buildflags",
+  if (enable_widevine) {
+    sources += [
+      "brave_drm_tab_helper.cc",
+      "brave_drm_tab_helper.h",
     ]
+    deps += [ "//brave/browser/widevine" ]
   }
 
   if (is_win && is_official_build) {

browser/brave_drm_tab_helper.cc

@@ -5,16 +5,13 @@
 
 #include "brave/browser/brave_drm_tab_helper.h"
 
+#include "brave/browser/widevine/widevine_utils.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/navigation_handle.h"
 
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) || BUILDFLAG(BUNDLE_WIDEVINE_CDM)
-#include "brave/browser/widevine/widevine_utils.h"
-#endif
-
 BraveDrmTabHelper::BraveDrmTabHelper(content::WebContents* contents)
     : WebContentsObserver(contents), bindings_(contents, this) {}
 
@@ -24,8 +21,7 @@ bool BraveDrmTabHelper::ShouldShowWidevineOptIn() const {
   // If the user already opted in, don't offer it.
   PrefService* prefs =
       static_cast<Profile*>(web_contents()->GetBrowserContext())->GetPrefs();
-  if (prefs->GetBoolean(kWidevineOptedIn) ||
-      !prefs->GetBoolean(kAskWidevineInstall)) {
+  if (IsWidevineOptedIn() || !prefs->GetBoolean(kAskWidevineInstall)) {
     return false;
   }
 
@@ -39,20 +35,16 @@ void BraveDrmTabHelper::DidStartNavigation(
     return;
   }
   is_widevine_requested_ = false;
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) || BUILDFLAG(BUNDLE_WIDEVINE_CDM)
   is_permission_requested_ = false;
-#endif
 }
 
 void BraveDrmTabHelper::OnWidevineKeySystemAccessRequest() {
   is_widevine_requested_ = true;
 
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) || BUILDFLAG(BUNDLE_WIDEVINE_CDM)
   if (ShouldShowWidevineOptIn() && !is_permission_requested_) {
     is_permission_requested_ = true;
     RequestWidevinePermission(web_contents());
   }
-#endif
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(BraveDrmTabHelper)

browser/brave_drm_tab_helper.h

@@ -10,7 +10,6 @@
 #include "content/public/browser/web_contents_binding_set.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "third_party/widevine/cdm/buildflags.h"
 
 // Reacts to DRM content detected on the renderer side.
 class BraveDrmTabHelper final
@@ -35,12 +34,10 @@ class BraveDrmTabHelper final
  private:
   content::WebContentsFrameBindingSet<brave_drm::mojom::BraveDRM> bindings_;
 
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) || BUILDFLAG(BUNDLE_WIDEVINE_CDM)
   // Permission request is done only once during the navigation. If user
   // chooses dismiss/deny, additional request is added again only when new
   // main frame navigation is started.
   bool is_permission_requested_ = false;
-#endif
 
   // True if we are notified that a page requested widevine availability.
   bool is_widevine_requested_ = false;

browser/brave_local_state_prefs.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/first_run/first_run.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
+#include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(ENABLE_BRAVE_REFERRALS)
 #include "brave/components/brave_referrals/browser/brave_referrals_service.h"
@@ -31,6 +32,10 @@
 #include "brave/components/p3a/p3a_core_metrics.h"
 #endif  // !defined(OS_ANDROID)
 
+#if BUILDFLAG(ENABLE_WIDEVINE)
+#include "brave/browser/widevine/widevine_utils.h"
+#endif
+
 namespace brave {
 
 void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -46,9 +51,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 #endif
 #if BUILDFLAG(ENABLE_TOR)
   tor::TorProfileService::RegisterLocalStatePrefs(registry);
-#endif
-#if !defined(OS_ANDROID)
-  RegisterPrefsForMuonMigration(registry);
 #endif
   registry->SetDefaultPrefValue(
       metrics::prefs::kMetricsReportingEnabled,
@@ -60,9 +62,15 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 
   brave_shields::RegisterShieldsP3APrefs(registry);
 #if !defined(OS_ANDROID)
+  RegisterPrefsForMuonMigration(registry);
+
   BraveWindowTracker::RegisterPrefs(registry);
   BraveUptimeTracker::RegisterPrefs(registry);
 #endif
+
+#if BUILDFLAG(ENABLE_WIDEVINE)
+  RegisterWidevineLocalstatePrefs(registry);
+#endif
 }
 
 }  // namespace brave

browser/brave_profile_prefs.cc

@@ -22,10 +22,6 @@
 #include "extensions/common/feature_switch.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
-#include "brave/browser/widevine/brave_widevine_bundle_manager.h"
-#endif
-
 #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT)
 #include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
 #endif
@@ -38,10 +34,21 @@
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
 #endif
 
+#if BUILDFLAG(ENABLE_WIDEVINE)
+#include "brave/browser/widevine/widevine_utils.h"
+#endif
+
 using extensions::FeatureSwitch;
 
 namespace brave {
 
+void RegisterProfilePrefsForMigration(
+    user_prefs::PrefRegistrySyncable* registry) {
+#if BUILDFLAG(ENABLE_WIDEVINE)
+  RegisterWidevineProfilePrefsForMigration(registry);
+#endif
+}
+
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   brave_shields::BraveShieldsWebContentsObserver::RegisterProfilePrefs(
       registry);
@@ -52,11 +59,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   brave_sync::prefs::Prefs::RegisterProfilePrefs(registry);
 
-  registry->RegisterBooleanPref(kWidevineOptedIn, false);
+  // TODO(shong): Migrate this to local state also and guard in ENABLE_WIDEVINE.
+  // We don't need to display "don't ask widevine prompt option" in settings
+  // if widevine is disabled.
+  // F/u issue: https://github.com/brave/brave-browser/issues/7000
   registry->RegisterBooleanPref(kAskWidevineInstall, true);
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
-  BraveWidevineBundleManager::RegisterProfilePrefs(registry);
-#endif
 
   // Default Brave shields
   registry->RegisterBooleanPref(kHTTPSEVerywhereControlType, true);
@@ -169,6 +176,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(kBraveWalletAES256GCMSivNonce, "");
   registry->RegisterStringPref(kBraveWalletEncryptedSeed, "");
   registry->RegisterBooleanPref(kBraveWalletEnabled, true);
+
+  RegisterProfilePrefsForMigration(registry);
 }
 
 }  // namespace brave

browser/brave_profile_prefs_browsertest.cc

@@ -29,8 +29,6 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, DownloadPromptDefault) {
 }
 
 IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
-  EXPECT_FALSE(
-      browser()->profile()->GetPrefs()->GetBoolean(kWidevineOptedIn));
   EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean(
       kHTTPSEVerywhereControlType));
   EXPECT_FALSE(

browser/brave_tab_helpers.cc

@@ -5,14 +5,14 @@
 
 #include "brave/browser/brave_tab_helpers.h"
 
-#include "brave/browser/brave_drm_tab_helper.h"
 #include "brave/browser/ui/bookmark/brave_bookmark_tab_helper.h"
 #include "brave/components/brave_ads/browser/ads_tab_helper.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
 #include "brave/components/brave_shields/browser/buildflags/buildflags.h"  // For STP
 #include "brave/components/greaselion/browser/buildflags/buildflags.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(ENABLE_GREASELION)
 #include "brave/browser/greaselion/greaselion_tab_helper.h"
@@ -32,6 +32,10 @@
 #include "brave/components/brave_shields/browser/tracking_protection_service.h"
 #endif
 
+#if BUILDFLAG(ENABLE_WIDEVINE)
+#include "brave/browser/brave_drm_tab_helper.h"
+#endif
+
 namespace brave {
 
 void AttachTabHelpers(content::WebContents* web_contents) {
@@ -46,7 +50,6 @@ void AttachTabHelpers(content::WebContents* web_contents) {
   BackgroundVideoPlaybackTabHelper::CreateForWebContents(web_contents);
 #else
   // Add tab helpers here unless they are intended for android too
-  BraveDrmTabHelper::CreateForWebContents(web_contents);
   BraveBookmarkTabHelper::CreateForWebContents(web_contents);
 #endif
 
@@ -60,6 +63,10 @@ void AttachTabHelpers(content::WebContents* web_contents) {
   }
 #endif
 
+#if BUILDFLAG(ENABLE_WIDEVINE)
+  BraveDrmTabHelper::CreateForWebContents(web_contents);
+#endif
+
   brave_ads::AdsTabHelper::CreateForWebContents(web_contents);
 }
 

browser/widevine/BUILD.gn

@@ -33,6 +33,7 @@ source_set("widevine") {
       "//components/prefs",
       "//components/pref_registry",
       "//components/services/unzip/public/cpp",
+      "//content/public/browser",
       "//services/network/public/cpp",
       "//services/service_manager/public/cpp",
       "//third_party/widevine/cdm:headers",

browser/widevine/brave_widevine_bundle_manager.cc

@@ -19,15 +19,13 @@
 #include "base/strings/string_piece.h"
 #include "base/task/post_task.h"
 #include "brave/browser/widevine/brave_widevine_bundle_unzipper.h"
-#include "brave/common/pref_names.h"
+#include "brave/browser/widevine/widevine_utils.h"
 #include "brave/common/brave_switches.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/system_network_context_manager.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/prefs/pref_service.h"
-#include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/cdm_info.h"
 #include "content/public/browser/cdm_registry.h"
@@ -61,38 +59,23 @@ base::Optional<base::FilePath> GetTargetWidevineBundleDir() {
 void ResetWidevinePrefs() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  Profile* profile = ProfileManager::GetActiveUserProfile();
-  DCHECK(profile);
-
-  profile->GetPrefs()->SetBoolean(kWidevineOptedIn, false);
-  profile->GetPrefs()->SetString(
-      kWidevineInstalledVersion,
+  SetWidevineOptedIn(false);
+  SetWidevineInstalledVersion(
       BraveWidevineBundleManager::kWidevineInvalidVersion);
 }
 
 void SetWidevinePrefsAsInstalledState() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  Profile* profile = ProfileManager::GetActiveUserProfile();
-  DCHECK(profile);
-
-  profile->GetPrefs()->SetBoolean(kWidevineOptedIn, true);
-  profile->GetPrefs()->SetString(kWidevineInstalledVersion,
-                                 WIDEVINE_CDM_VERSION_STRING);
+  SetWidevineOptedIn(true);
+  SetWidevineInstalledVersion(WIDEVINE_CDM_VERSION_STRING);
 }
 
 }  // namespace
 
 // static
 char BraveWidevineBundleManager::kWidevineInvalidVersion[] = "";
 
-// static
-void BraveWidevineBundleManager::RegisterProfilePrefs(
-    user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterStringPref(kWidevineInstalledVersion,
-                               kWidevineInvalidVersion);
-}
-
 BraveWidevineBundleManager::BraveWidevineBundleManager() : weak_factory_(this) {
 }
 
@@ -267,19 +250,15 @@ void BraveWidevineBundleManager::StartupCheck() {
     return;
   }
 
-  Profile* profile = ProfileManager::GetActiveUserProfile();
-  DCHECK(profile);
-
   // Although this case would be very rare, this might be happen because
   // bundle unzipping and prefs setting is done asynchronously.
-  if (!profile->GetPrefs()->GetBoolean(kWidevineOptedIn)) {
+  if (!IsWidevineOptedIn()) {
     DVLOG(1) << __func__ << ": recover invalid widevine prefs state";
     SetWidevinePrefsAsInstalledState();
     return;
   }
 
-  const std::string installed_version =
-      profile->GetPrefs()->GetString(kWidevineInstalledVersion);
+  const std::string installed_version = GetWidevineInstalledVersion();
 
   DVLOG(1) << __func__ << ": widevine prefs state looks fine";
   DVLOG(1) << __func__ << ": installed widevine version: " << installed_version;
@@ -327,9 +306,7 @@ void BraveWidevineBundleManager::OnBackgroundUpdateFinished(
 void BraveWidevineBundleManager::DoDelayedBackgroundUpdate() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  Profile* profile = ProfileManager::GetActiveUserProfile();
-  const std::string installed_version =
-      profile->GetPrefs()->GetString(kWidevineInstalledVersion);
+  const std::string installed_version = GetWidevineInstalledVersion();
 
   DVLOG(1) << __func__ << ": update widevine"
            << " from " << installed_version

browser/widevine/brave_widevine_bundle_manager.h

@@ -25,14 +25,9 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
-
 class BraveWidevineBundleManager {
  public:
   static char kWidevineInvalidVersion[];
-  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Called when install process is finished.
   using DoneCallback = base::OnceCallback<void(const std::string& error)>;