brave · bbondy · Jun 27, 2018 · Jun 22, 2018 · Jun 22, 2018 · Jun 22, 2018
@@ -80,6 +80,23 @@
       <message name="IDS_SETTINGS_IMPORT_COOKIES_CHECKBOX" desc="Checkbox for importing cookies">
         Cookies
       </message>
+      <message name="IDS_WIDEVINE_NOT_INSTALLED_EXPLANATORY_TEXT" desc="Explanatory animated text that appears (and then disappears) in the address line when Widevine is blocked">
+        Widevine is not installed
+      </message>
+      <message name="IDS_WIDEVINE_NOT_INSTALLED_MESSAGE" desc="Tooltip on the icon when Wideivne is not installed. 'Widevine' is the name of a plugin and should not be translated.">
+        Widevine is not installed.
+      </message>
+      <message name="IDS_INSTALL_AND_RUN_WIDEVINE" desc="Button to install and register Widevine with the component updater.  'Widevine' is the name of a plugin and should not be translated.">
+        Install and run Widevine
+      </message>
+      <message name="IDS_NOT_INSTALLED_WIDEVINE_TITLE" desc="Bubble info header text when Widevine is not installed. 'Widevine' is the name of a plugin and should not be translated.">
+        Widevine is not installed
+      </message>
+      <message name="IDS_WIDEVINE_INSTALL_MESSAGE" desc="Bubble info text when Widevine is not installed. 'Widevine' is the name of a plugin and should not be translated.">
+        Google Widevine is a piece of Digital Rights Management (DRM) code that we at Brave Software do not own and cannot inspect. The Google Widevine code is loaded from Google servers, not from our servers. It is loaded only when you enable this option. We discourage the use of DRM, but we respect user choice and acknowledge that some Brave users would like to use services that require it.
+
+By installing this extension, you are agreeing to the Google Widevine Terms of Use. You agree that Brave is not responsible for any damages or losses in connection with your use of Google Widevine.
+      </message>
     </messages>
     <includes>
       <include name="IDR_BRAVE_TAG_SERVICES_POLYFILL" file="resources/js/tag_services_polyfill.js" type="BINDATA" />

diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc
@@ -41,19 +41,31 @@ BraveBrowserProcessImpl::BraveBrowserProcessImpl(
 }
 
 component_updater::ComponentUpdateService*
-BraveBrowserProcessImpl::component_updater() {
-  if (component_updater_)
-    return component_updater_.get();
+BraveBrowserProcessImpl::component_updater(
+    std::unique_ptr<component_updater::ComponentUpdateService> &component_updater,
+    bool use_brave_server) {
+  if (component_updater)
+    return component_updater.get();
 
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
     return nullptr;
 
-  component_updater_ = component_updater::ComponentUpdateServiceFactory(
+  component_updater = component_updater::ComponentUpdateServiceFactory(
       component_updater::MakeBraveComponentUpdaterConfigurator(
           base::CommandLine::ForCurrentProcess(),
-          g_browser_process->local_state()));
+          g_browser_process->local_state(), use_brave_server));
+
+  return component_updater.get();
+}
+
+component_updater::ComponentUpdateService*
+BraveBrowserProcessImpl::component_updater() {
+  return component_updater(component_updater_, true);
+}
 
-  return component_updater_.get();
+component_updater::ComponentUpdateService*
+BraveBrowserProcessImpl::google_component_updater() {
+  return component_updater(google_component_updater_, false);
 }
 
 brave_shields::AdBlockService*

diff --git a/browser/brave_browser_process_impl.h b/browser/brave_browser_process_impl.h
@@ -25,6 +25,7 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
 
   // BrowserProcess implementation.
   component_updater::ComponentUpdateService* component_updater() override;
+  component_updater::ComponentUpdateService* google_component_updater();
 
   brave_shields::AdBlockService* ad_block_service();
   brave_shields::AdBlockRegionalService* ad_block_regional_service();
@@ -41,6 +42,14 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
       https_everywhere_service_;
   std::unique_ptr<brave::BraveStatsUpdater> brave_stats_updater_;
 
+  component_updater::ComponentUpdateService* component_updater(
+      std::unique_ptr<component_updater::ComponentUpdateService> &,
+      bool use_brave_server);
+  std::unique_ptr<component_updater::ComponentUpdateService>
+      google_component_updater_;
+  std::unique_ptr<component_updater::ComponentUpdateService>
+      brave_component_updater_;
+
   DISALLOW_COPY_AND_ASSIGN(BraveBrowserProcessImpl);
 };
 

diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -4,6 +4,7 @@
 
 #include "brave/browser/brave_profile_prefs.h"
 
+#include "brave/common/pref_names.h"
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/common/pref_names.h"
@@ -16,6 +17,8 @@ namespace brave {
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   brave_shields::BraveShieldsWebContentsObserver::RegisterProfilePrefs(registry);
 
+  registry->RegisterBooleanPref(kWidevineOptedIn, false);
+
   // No sign into Brave functionality
   registry->SetDefaultPrefValue(prefs::kSigninAllowed, base::Value(false));
 

diff --git a/browser/brave_profile_prefs_browsertest.cc b/browser/brave_profile_prefs_browsertest.cc
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "brave/common/pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
@@ -14,4 +15,6 @@ using BraveProfilePrefsBrowserTest = InProcessBrowserTest;
 IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, DownloadPromptDefault) {
   EXPECT_TRUE(
       browser()->profile()->GetPrefs()->GetBoolean(prefs::kPromptForDownload));
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(kWidevineOptedIn));
 }
diff --git a/browser/component_updater/brave_component_updater_configurator.cc b/browser/component_updater/brave_component_updater_configurator.cc
@@ -12,6 +12,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/version.h"
+#include "brave/common/network_constants.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
@@ -36,7 +37,8 @@ namespace {
 class BraveConfigurator : public update_client::Configurator {
  public:
   BraveConfigurator(const base::CommandLine* cmdline,
-                    PrefService* pref_service);
+                    PrefService* pref_service,
+                    bool use_brave_server);
 
   // update_client::Configurator overrides.
   int InitialDelay() const override;
@@ -70,6 +72,7 @@ class BraveConfigurator : public update_client::Configurator {
 
   ConfiguratorImpl configurator_impl_;
   PrefService* pref_service_;  // This member is not owned by this class.
+  bool use_brave_server_;
 
   ~BraveConfigurator() override {}
 };
@@ -79,14 +82,22 @@ class BraveConfigurator : public update_client::Configurator {
 // a custom message signing protocol and it does not depend on using HTTPS.
 BraveConfigurator::BraveConfigurator(
     const base::CommandLine* cmdline,
-    PrefService* pref_service)
+    PrefService* pref_service,
+    bool use_brave_server)
     : configurator_impl_(cmdline, false),
-      pref_service_(pref_service) {
+      pref_service_(pref_service),
+      use_brave_server_(use_brave_server) {
   DCHECK(pref_service_);
 }
 
 int BraveConfigurator::InitialDelay() const {
-  return configurator_impl_.InitialDelay();
+  if (use_brave_server_) {
+    return configurator_impl_.InitialDelay();
+  }
+  // This just makes it so as soon as the Google component update
+  // is used it checks for Widevine, which is currently the only
+  // place we use it.
+  return 10;
 }
 
 int BraveConfigurator::NextCheckDelay() const {
@@ -102,6 +113,10 @@ int BraveConfigurator::UpdateDelay() const {
 }
 
 std::vector<GURL> BraveConfigurator::UpdateUrl() const {
+  if (use_brave_server_) {
+    return std::vector<GURL>
+        {GURL(kBraveUpdatesExtensionsEndpoint)};
+  }
   return configurator_impl_.UpdateUrl();
 }
 
@@ -167,7 +182,10 @@ bool BraveConfigurator::EnabledBackgroundDownloader() const {
 }
 
 bool BraveConfigurator::EnabledCupSigning() const {
-  return false;
+  if (use_brave_server_) {
+    return false;
+  }
+  return configurator_impl_.EnabledCupSigning();
 }
 
 PrefService* BraveConfigurator::GetPrefService() const {
@@ -198,8 +216,9 @@ void RegisterPrefsForBraveComponentUpdaterConfigurator(
 scoped_refptr<update_client::Configurator>
 MakeBraveComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
-    PrefService* pref_service) {
-  return base::MakeRefCounted<BraveConfigurator>(cmdline, pref_service);
+    PrefService* pref_service,
+    bool use_brave_server) {
+  return base::MakeRefCounted<BraveConfigurator>(cmdline, pref_service, use_brave_server);
 }
 
 }  // namespace component_updater
diff --git a/browser/component_updater/brave_component_updater_configurator.h b/browser/component_updater/brave_component_updater_configurator.h
@@ -31,7 +31,8 @@ void RegisterPrefsForBraveComponentUpdaterConfigurator(
 scoped_refptr<update_client::Configurator>
 MakeBraveComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
-    PrefService* pref_service);
+    PrefService* pref_service,
+    bool use_brave_server);
 
 }  // namespace component_updater
 

@@ -12,19 +12,6 @@
 
 namespace brave {
 
-bool IsUpdaterURL(const GURL& gurl) {
-  static std::vector<URLPattern> updater_patterns({
-      URLPattern(URLPattern::SCHEME_HTTPS, std::string(component_updater::kUpdaterDefaultUrl) + "*"),
-      URLPattern(URLPattern::SCHEME_HTTP, std::string(component_updater::kUpdaterFallbackUrl) + "*"),
-      URLPattern(URLPattern::SCHEME_HTTPS, std::string(component_updater::kUpdaterDefaultUrlAlt) + "*"),
-      URLPattern(URLPattern::SCHEME_HTTP, std::string(component_updater::kUpdaterFallbackUrlAlt) + "*"),
-  });
-  return std::any_of(updater_patterns.begin(), updater_patterns.end(),
-      [&gurl](URLPattern pattern){
-        return pattern.MatchesURL(gurl);
-      });
-}
-
 int OnBeforeURLRequest_StaticRedirectWork(
     net::URLRequest* request,
     GURL* new_url,
@@ -45,11 +32,6 @@ int OnBeforeURLRequest_StaticRedirectWork(
     return net::OK;
   }
 
-  if (IsUpdaterURL(request->url())) {
-    replacements.SetQueryStr(request->url().query_piece());
-    *new_url = GURL(kBraveUpdatesExtensionsEndpoint).ReplaceComponents(replacements);
-    return net::OK;
-  }
   return net::OK;
 }
 

@@ -110,25 +110,4 @@ TEST_F(BraveStaticRedirectNetworkDelegateHelperTest, ModifySafeBrowsingURLV5) {
   EXPECT_EQ(ret, net::OK);
 }
 
-
-TEST_F(BraveStaticRedirectNetworkDelegateHelperTest, ModifyComponentUpdaterURL) {
-  net::TestDelegate test_delegate;
-  std::string query_string("?foo=bar");
-  GURL url(std::string(component_updater::kUpdaterDefaultUrl) + query_string);
-  std::unique_ptr<net::URLRequest> request =
-      context()->CreateRequest(url, net::IDLE, &test_delegate,
-                             TRAFFIC_ANNOTATION_FOR_TESTS);
-  std::shared_ptr<brave::BraveRequestInfo>
-      before_url_context(new brave::BraveRequestInfo());
-  brave::ResponseCallback callback;
-  GURL new_url;
-  GURL expected_url(std::string(kBraveUpdatesExtensionsEndpoint + query_string));
-  int ret =
-      OnBeforeURLRequest_StaticRedirectWork(request.get(), &new_url, callback,
-                                            before_url_context);
-  EXPECT_EQ(new_url, expected_url);
-  EXPECT_EQ(ret, net::OK);
-}
-
-
 }  // namespace
diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn
@@ -5,10 +5,18 @@ source_set("ui") {
   sources = [
     "brave_browser_command_controller.cc",
     "brave_browser_command_controller.h",
+    "brave_browser_content_setting_bubble_model_delegate.cc",
+    "brave_browser_content_setting_bubble_model_delegate.h",
     "brave_pages.cc",
     "brave_pages.h",
     "content_settings/brave_content_setting_bubble_model.cc",
     "content_settings/brave_content_setting_bubble_model.h",
+    "content_settings/brave_content_setting_image_models.cc",
+    "content_settings/brave_content_setting_image_models.h",
+    "content_settings/brave_widevine_blocked_image_model.cc",
+    "content_settings/brave_widevine_blocked_image_model.h",
+    "content_settings/brave_widevine_content_setting_bubble_model.cc",
+    "content_settings/brave_widevine_content_setting_bubble_model.h",
     "toolbar/brave_app_menu_model.cc",
     "toolbar/brave_app_menu_model.h",
     "views/importer/brave_import_lock_dialog_view.cc",

diff --git a/browser/ui/brave_browser_content_setting_bubble_model_delegate.cc b/browser/ui/brave_browser_content_setting_bubble_model_delegate.cc
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/ui/brave_browser_content_setting_bubble_model_delegate.h"
+
+#include "brave/common/url_constants.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+
+BraveBrowserContentSettingBubbleModelDelegate::
+BraveBrowserContentSettingBubbleModelDelegate(Browser* browser) :
+    BrowserContentSettingBubbleModelDelegate(browser),
+    browser_(browser) {
+}
+
+BraveBrowserContentSettingBubbleModelDelegate::
+~BraveBrowserContentSettingBubbleModelDelegate() {
+}
+
+void
+BraveBrowserContentSettingBubbleModelDelegate::ShowWidevineLearnMorePage() {
+  GURL learn_more_url = GURL(kWidevineTOS);
+  chrome::AddSelectedTabWithURL(browser_, learn_more_url,
+                                ui::PAGE_TRANSITION_LINK);
+}
diff --git a/browser/ui/brave_browser_content_setting_bubble_model_delegate.h b/browser/ui/brave_browser_content_setting_bubble_model_delegate.h
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_UI_BRAVE_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_
+#define BRAVE_BROWSER_UI_BRAVE_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_
+
+#include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
+
+class BraveBrowserContentSettingBubbleModelDelegate
+    : public BrowserContentSettingBubbleModelDelegate {
+ public:
+  explicit BraveBrowserContentSettingBubbleModelDelegate(Browser* browser);
+  ~BraveBrowserContentSettingBubbleModelDelegate() override;
+
+  void ShowWidevineLearnMorePage();
+
+ private:
+  Browser* const browser_;
+
+  DISALLOW_COPY_AND_ASSIGN(BraveBrowserContentSettingBubbleModelDelegate);
+};
+
+#endif  // BRAVE_BROWSER_UI_BRAVE_BROWSER_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_
diff --git a/browser/ui/content_settings/brave_content_setting_bubble_model.h b/browser/ui/content_settings/brave_content_setting_bubble_model.h
@@ -8,9 +8,10 @@ class Profile;
 
 class BraveContentSettingPluginBubbleModel : public ContentSettingSimpleBubbleModel {
  public:
-  BraveContentSettingPluginBubbleModel(Delegate* delegate,
-                                  content::WebContents* web_contents,
-                                  Profile* profile);
+  BraveContentSettingPluginBubbleModel(
+      ContentSettingBubbleModel::Delegate* delegate,
+      content::WebContents* web_contents,
+      Profile* profile);
 
  private:
   void OnLearnMoreClicked() override;

diff --git a/browser/ui/content_settings/brave_content_setting_image_models.cc b/browser/ui/content_settings/brave_content_setting_image_models.cc
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/ui/content_settings/brave_content_setting_image_models.h"
+
+#include "brave/browser/ui/content_settings/brave_widevine_blocked_image_model.h"
+
+void BraveGenerateContentSettingImageModels(
+    std::vector<std::unique_ptr<ContentSettingImageModel>>& result) {
+  result.push_back(std::make_unique<BraveWidevineBlockedImageModel>(
+      BraveWidevineBlockedImageModel::ImageType::PLUGINS,
+      CONTENT_SETTINGS_TYPE_PLUGINS));
+}
diff --git a/browser/ui/content_settings/brave_content_setting_image_models.h b/browser/ui/content_settings/brave_content_setting_image_models.h
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <memory>
+#include <vector>
+
+class ContentSettingImageModel;
+
+void BraveGenerateContentSettingImageModels(
+    std::vector<std::unique_ptr<ContentSettingImageModel>>&);