Merge pull request #1018 from brave/71.0.3578.80

Upgrade from 71.0.3578.75 to 71.0.3578.80
brave · Dec 4, 2018 · 32ca7ec · 32ca7ec
1 parent ef052ce
commit 32ca7ec
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 20 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -54,13 +54,10 @@ BraveMainDelegate::CreateContentBrowserClient() {
   return NULL;
 #else
   if (chrome_content_browser_client_ == nullptr) {
-    DCHECK(service_manifest_data_pack_);
-    DCHECK(service_manifest_data_pack_);
     DCHECK(!chrome_feature_list_creator_);
     chrome_feature_list_creator_ = std::make_unique<ChromeFeatureListCreator>();
     chrome_content_browser_client_ =
         std::make_unique<BraveContentBrowserClient>(
-            std::move(service_manifest_data_pack_),
             chrome_feature_list_creator_.get());
   }
   return chrome_content_browser_client_.get();

diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc
@@ -67,9 +67,8 @@ bool HandleURLReverseRewrite(GURL* url,
 
 }  // namespace
 
-BraveContentBrowserClient::BraveContentBrowserClient(std::unique_ptr<ui::DataPack> data_pack,
-    ChromeFeatureListCreator* chrome_feature_list_creator) :
-    ChromeContentBrowserClient(std::move(data_pack), chrome_feature_list_creator)
+BraveContentBrowserClient::BraveContentBrowserClient(ChromeFeatureListCreator* chrome_feature_list_creator) :
+    ChromeContentBrowserClient(chrome_feature_list_creator)
 {}
 
 BraveContentBrowserClient::~BraveContentBrowserClient() {}

diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h
@@ -12,8 +12,7 @@
 
 class BraveContentBrowserClient : public ChromeContentBrowserClient {
  public:
-  BraveContentBrowserClient(std::unique_ptr<ui::DataPack> data_pack = nullptr,
-      ChromeFeatureListCreator* chrome_feature_list_creator = nullptr);
+  BraveContentBrowserClient(ChromeFeatureListCreator* chrome_feature_list_creator = nullptr);
   ~BraveContentBrowserClient() override;
 
    // Overridden from ChromeContentBrowserClient:

diff --git a/components/brave_shields/browser/ad_block_service_browsertest.cc b/components/brave_shields/browser/ad_block_service_browsertest.cc
@@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, NotAdsDoNotGetBlockedByDefaultBlocker
 // Load a page with an ad image, and make sure it is blocked by the
 // regional blocker.
 IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, AdsGetBlockedByRegionalBlocker) {
-  g_browser_process->SetApplicationLocale("fr", "fr");
+  g_browser_process->SetApplicationLocale("fr");
   ASSERT_EQ(g_browser_process->GetApplicationLocale(), "fr");
 
   ASSERT_TRUE(StartAdBlockRegionalService());
@@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, AdsGetBlockedByRegionalBlocker) {
 // Load a page with an image which is not an ad, and make sure it is
 // NOT blocked by the regional blocker.
 IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, NotAdsDoNotGetBlockedByRegionalBlocker) {
-  g_browser_process->SetApplicationLocale("fr", "fr");
+  g_browser_process->SetApplicationLocale("fr");
   ASSERT_EQ(g_browser_process->GetApplicationLocale(), "fr");
 
   ASSERT_TRUE(StartAdBlockRegionalService());

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,11 +1,11 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 595dabb229d5ec21dbd0e6fc339cf488d7d91724..48b98b11a12e27a8a947496765c590d799763267 100644
+index 980fdaa181c1204e1188eb40661ac3cc4d9f93d3..defb7eabb9b63fe2f8cff5983a0e984ef336dd4c 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=71
  MINOR=0
 -BUILD=3578
--PATCH=75
+-PATCH=80
 +BUILD=59
 +PATCH=1
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 94886afca0c71f2285c8e1ffd6eeb738ed9ed041..90c4854630a51119dfa352ee0bd45a5e9897ba77 100644
+index 8947045aed9380d1f1f104b68674a1b5aa0b04e6..9c12f21fe66d2971075f973515e40a396af5b94c 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1978,6 +1978,7 @@ jumbo_split_static_library("browser") {
+@@ -1980,6 +1980,7 @@ jumbo_split_static_library("browser") {
      "//ui/strings",
      "//ui/surface",
      "//ui/web_dialogs",

diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index 690c4f6cb9acb8e3b30d000769fdc1aeba3b177c..cb300cd02f8839472e225951c014ba9151a08b8a 100644
+index ab192b468f539a49a3990260b30c794034ce97dd..ec77ef3946ecbe5dd8dc1eff854ce5d1cc987d4d 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -204,6 +204,7 @@ class BrowserProcessImpl : public BrowserProcess,
-   static void RegisterPrefs(PrefRegistrySimple* registry);
+@@ -206,6 +206,7 @@ class BrowserProcessImpl : public BrowserProcess,
+   std::string actual_locale();
 
   private:
 +  friend class BraveBrowserProcessImpl;

diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index f6088e78876db5bc78d2cc94cd2532c4da3937ef..4045b5f8208624d8bbe07f5513139f2891e81396 100644
+index 790816865e007a4c160bc5acc53951785f431dbb..eba95551f588ce09fa04138d861cb6a5928706d2 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
-@@ -515,6 +515,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
+@@ -513,6 +513,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
                                   content::BrowserContext* browser_context);
 
   private:

diff --git a/patches/chrome-browser-profiles-profile_manager.cc.patch b/patches/chrome-browser-profiles-profile_manager.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
-index 39bd5b180453f3e01cde401c36ae25b658ab952f..906fbab18befa7efac1cde0cf0448f284e2b72cf 100644
+index 08c6c70aea17a7b3d942b5cd579aa1b418aa03e5..058afcf21087134eaabf3df00635d98262014b19 100644
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
 @@ -1482,9 +1482,11 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion(