Fix nwjs/nw.js#7023: Phoning home to accounts.google.com

rogerwang · rogerwang · commit dd4bccf65d25 · 2019-04-07T07:44:12.000-06:00
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
@@ -1655,7 +1655,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   //
   // This can't be created in the BrowserProcessImpl constructor because it
   // needs to read prefs that get set after that runs.
-  browser_process_->intranet_redirect_detector();
+  //browser_process_->intranet_redirect_detector();
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
   if (parsed_command_line().HasSwitch(switches::kDebugPrint)) {
diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
@@ -117,6 +117,7 @@ ModelLoader::~ModelLoader() {
 }
 
 void ModelLoader::StartFetch() {
+#if 0
   // Start fetching the model either from the cache or possibly from the
   // network if the model isn't in the cache.
 
@@ -163,6 +164,7 @@ void ModelLoader::StartFetch() {
       url_loader_factory_.get(),
       base::BindOnce(&ModelLoader::OnURLLoaderComplete,
                      base::Unretained(this)));
+#endif
 }
 
 void ModelLoader::OnURLLoaderComplete(
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc
@@ -262,13 +262,14 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoaderImpl(
     : url_loader_factory_(url_loader_factory),
       google_url_tracker_(google_url_tracker),
       application_locale_(application_locale),
-      account_consistency_mirror_required_(account_consistency_mirror_required),
+      //      account_consistency_mirror_required_(account_consistency_mirror_required),
       weak_ptr_factory_(this) {}
 
 OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
 
 void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
   callbacks_.push_back(std::move(callback));
+#if 0
 
   // Note: If there is an ongoing request, abandon it. It's possible that
   // something has changed in the meantime (e.g. signin state) that would make
@@ -278,6 +279,7 @@ void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
       base::BindOnce(&OneGoogleBarLoaderImpl::LoadDone,
                      base::Unretained(this)));
   pending_request_->Start();
+#endif
 }
 
 GURL OneGoogleBarLoaderImpl::GetLoadURLForTesting() const {
diff --git a/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.h b/chrome/browser/search/one_google_bar/one_google_bar_loader_impl.h
@@ -59,7 +59,7 @@ class OneGoogleBarLoaderImpl : public OneGoogleBarLoader {
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
   GoogleURLTracker* google_url_tracker_;
   const std::string application_locale_;
-  const bool account_consistency_mirror_required_;
+  //const bool account_consistency_mirror_required_;
 
   std::vector<OneGoogleCallback> callbacks_;
   std::unique_ptr<AuthenticatedURLLoader> pending_request_;
diff --git a/components/gcm_driver/gcm_channel_status_syncer.cc b/components/gcm_driver/gcm_channel_status_syncer.cc
@@ -21,7 +21,6 @@
 #include "components/prefs/pref_service.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
-#include "content/nw/src/nw_base.h"
 
 namespace gcm {
 
@@ -64,7 +63,7 @@ const char kCustomPollIntervalMinutes[] = "gcm-channel-poll-interval";
 
 // static
 void GCMChannelStatusSyncer::RegisterPrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kGCMChannelStatus, nw::gcm_enabled());
+  registry->RegisterBooleanPref(prefs::kGCMChannelStatus, false);
   registry->RegisterIntegerPref(
       prefs::kGCMChannelPollIntervalSeconds,
       GCMChannelStatusRequest::default_poll_interval_seconds());
@@ -74,7 +73,7 @@ void GCMChannelStatusSyncer::RegisterPrefs(PrefRegistrySimple* registry) {
 // static
 void GCMChannelStatusSyncer::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(prefs::kGCMChannelStatus, nw::gcm_enabled());
+  registry->RegisterBooleanPref(prefs::kGCMChannelStatus, false);
   registry->RegisterIntegerPref(
       prefs::kGCMChannelPollIntervalSeconds,
       GCMChannelStatusRequest::default_poll_interval_seconds());
@@ -98,7 +97,7 @@ GCMChannelStatusSyncer::GCMChannelStatusSyncer(
       user_agent_(user_agent),
       url_loader_factory_(std::move(url_loader_factory)),
       started_(false),
-      gcm_enabled_(nw::gcm_enabled()),
+      gcm_enabled_(false),
       poll_interval_seconds_(
           GCMChannelStatusRequest::default_poll_interval_seconds()),
       custom_poll_interval_use_count_(0),
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc
@@ -32,7 +32,6 @@
 #include "components/timers/alarm_timer_chromeos.h"
 #endif
 
-#include "content/nw/src/nw_base.h"
 
 namespace gcm {
 
@@ -1254,7 +1253,7 @@ GCMClient::Result GCMDriverDesktop::EnsureStarted(
 
   // Polling for channel status should be invoked when GCM is being requested,
   // no matter whether GCM is enabled or nor.
-  if (nw::gcm_enabled())
+  if (false)
     gcm_channel_status_syncer_->EnsureStarted();
 
   if (!gcm_enabled_)
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
@@ -862,7 +862,7 @@ void SearchProvider::ApplyCalculatedNavigationRelevance(
 std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
     const TemplateURL* template_url,
     const AutocompleteInput& input) {
-  if (!template_url || template_url->suggestions_url().empty())
+  if (true || !template_url || template_url->suggestions_url().empty())
     return nullptr;
 
   // Setting SuggestUrl the same as SearchUrl is a typical misconfiguration.
diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc
@@ -311,6 +311,7 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
     return;
   }
 
+#if 0
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("safe_browsing_v4_update", R"(
         semantics {
@@ -353,7 +354,7 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
                      base::Unretained(this)));
 
   request_ = std::move(loader);
-
+#endif
   // Begin the update request timeout.
   timeout_timer_.Start(FROM_HERE,
                        TimeDelta::FromSeconds(kV4TimerUpdateWaitSecMax), this,
diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/search_provider_logos/logo_service_impl.cc
@@ -266,7 +266,7 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks) {
     base_url = doodle_url.GetOrigin();
   }
 
-  if (!logo_url.is_valid() && !doodle_url.is_valid()) {
+  if (true) { //!logo_url.is_valid() && !doodle_url.is_valid()) {
     RunCallbacksWithDisabled(std::move(callbacks));
     return;
   }
diff --git a/components/update_client/ping_manager.cc b/components/update_client/ping_manager.cc
@@ -67,7 +67,7 @@ PingSender::~PingSender() {
 void PingSender::SendPing(const Component& component, Callback callback) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
-  if (component.events().empty()) {
+  if (true) { //component.events().empty()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(std::move(callback), kErrorNoEvents, ""));
     return;
diff --git a/components/update_client/update_checker.cc b/components/update_client/update_checker.cc
@@ -38,6 +38,7 @@ namespace update_client {
 
 namespace {
 
+#if 0
 // Returns a sanitized version of the brand or an empty string otherwise.
 std::string SanitizeBrand(const std::string& brand) {
   return IsValidBrand(brand) ? brand : std::string("");
@@ -66,6 +67,8 @@ InstallerAttributesFlatMap SanitizeInstallerAttributes(
   return sanitized_attrs;
 }
 
+#endif
+
 class UpdateCheckerImpl : public UpdateChecker {
  public:
   UpdateCheckerImpl(scoped_refptr<Configurator> config,
@@ -159,7 +162,7 @@ void UpdateCheckerImpl::CheckForUpdatesHelper(
     const base::flat_map<std::string, std::string>& additional_attributes,
     bool enabled_component_updates) {
   DCHECK(thread_checker_.CalledOnValidThread());
-
+#if 0
   auto urls(config_->UpdateUrl());
   if (IsEncryptionRequired(components))
     RemoveUnsecureUrls(&urls);
@@ -222,6 +225,7 @@ void UpdateCheckerImpl::CheckForUpdatesHelper(
       config_->EnabledCupSigning(),
       base::BindOnce(&UpdateCheckerImpl::OnRequestSenderComplete,
                      base::Unretained(this)));
+#endif
 }
 
 void UpdateCheckerImpl::OnRequestSenderComplete(
diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -44,7 +44,7 @@ namespace {
 const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SAVE_COOKIES;
 
-const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
+//const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
 
 std::unique_ptr<const GaiaAuthConsumer::ClientOAuthResult>
 ExtractOAuth2TokenPairResponse(const std::string& data) {
@@ -258,6 +258,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
     const GURL& gaia_gurl,
     int load_flags,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
+#if 0
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   auto resource_request = std::make_unique<network::ResourceRequest>();
@@ -314,6 +315,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
       base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
                      base::Unretained(this)),
       kMaxMessageSize);
+#endif
 }
 
 // static

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ ModelLoader::~ModelLoader() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`void ModelLoader::StartFetch() {`
	`120`	`+#if 0`
`120`	`121`	`// Start fetching the model either from the cache or possibly from the`
`121`	`122`	`// network if the model isn't in the cache.`
`122`	`123`
`@@ -163,6 +164,7 @@ void ModelLoader::StartFetch() {`
`163`	`164`	`url_loader_factory_.get(),`
`164`	`165`	`base::BindOnce(&ModelLoader::OnURLLoaderComplete,`
`165`	`166`	`base::Unretained(this)));`
	`167`	`+#endif`
`166`	`168`	`}`
`167`	`169`
`168`	`170`	`void ModelLoader::OnURLLoaderComplete(`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks) {`
`266`	`266`	`base_url = doodle_url.GetOrigin();`
`267`	`267`	`}`
`268`	`268`
`269`		`- if (!logo_url.is_valid() && !doodle_url.is_valid()) {`
	`269`	`+ if (true) { //!logo_url.is_valid() && !doodle_url.is_valid()) {`
`270`	`270`	`RunCallbacksWithDisabled(std::move(callbacks));`
`271`	`271`	`return;`
`272`	`272`	`}`