update

brave · May 23, 2020 · 8fc7ff4 · 8fc7ff4
1 parent 4a775b3
commit 8fc7ff4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -62,7 +62,7 @@ base::LazyInstance<BraveContentBrowserClient>::DestructorAtExit
  g_brave_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 #endif
 
-const char kBraveGaiaProxy[] = "https://gaia.brave.com";
+const char kBraveGaiaProxy[] = "https://accounts.google.com";
 
 BraveMainDelegate::BraveMainDelegate()
  : ChromeMainDelegate() {}

diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc
@@ -11,7 +11,6 @@
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_sync/features.h"
 #include "chrome/common/chrome_features.h"
-#include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "content/public/browser/render_frame_host.h"
@@ -115,8 +114,8 @@ void BraveBrowserMainParts::PostProfileInit() {
 
 #if defined(OS_ANDROID)
  if (profile()->GetPrefs()->GetBoolean(kBackgroundVideoPlaybackEnabled)) {
- auto* command_line = base::CommandLine::ForCurrentProcess();
  content::RenderFrameHost::AllowInjectingJavaScript();
+ auto* command_line = base::CommandLine::ForCurrentProcess();
  command_line->AppendSwitch(switches::kDisableMediaSuspend);
  }
 #endif

diff --git a/browser/ui/webui/settings/brave_social_blocking_handler.cc b/browser/ui/webui/settings/brave_social_blocking_handler.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
  * 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/. */
@@ -9,14 +9,9 @@
 
 #include "base/bind.h"
 #include "base/values.h"
-#include "brave/browser/brave_browser_process_impl.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"

diff --git a/browser/ui/webui/settings/brave_social_blocking_handler.h b/browser/ui/webui/settings/brave_social_blocking_handler.h
@@ -9,10 +9,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "brave/browser/tor/buildflags.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
-#include "chrome/common/extensions/webstore_install_result.h"
-#include "components/prefs/pref_change_registrar.h"
 
 class Profile;
 

diff --git a/chromium_src/chrome/browser/profiles/pref_service_builder_utils.cc b/chromium_src/chrome/browser/profiles/pref_service_builder_utils.cc
@@ -40,7 +40,6 @@ void RegisterProfilePrefs(bool is_signin_profile,
  // Disable spell check service
  registry->SetDefaultPrefValue(
  spellcheck::prefs::kSpellCheckUseSpellingService, base::Value(false));
-
 #if defined(OS_LINUX)
  // Use brave theme by default instead of gtk theme.
  registry->SetDefaultPrefValue(prefs::kUsesSystemTheme, base::Value(false));
@@ -66,13 +65,6 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreatePrefService(
  g_browser_process->profile_manager()->GetProfileByPath(original_path);
  DCHECK(original_profile);
  PrefStore* extension_pref_store = nullptr;
-
- // Make sure sign into Brave is not enabled
- // The older kSigninAllowed is deprecated and only in use in Android until
- // C71.
- // auto googleLogin = original_profile->GetPrefs()->GetBoolean(kGoogleLoginControlType);
- //original_profile->GetPrefs()->SetBoolean(prefs::kSigninAllowedOnNextStartup,
- // false);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
  extension_pref_store = new ExtensionPrefStore(