Merge 118016 - Disable GAIA profile info

chrome/browser/profiles/gaia_info_update_service.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Update the user's GAIA info every 24 hours.
 const int kUpdateIntervalHours = 24;
 
@@ skipping 32 matching lines @@
 // static
 bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) {
 #if defined(OS_CHROMEOS)
   return false;
 #endif
 
   // Sync must be allowed.
   if (!profile->GetOriginalProfile()->IsSyncAccessible())
     return false;
 
-  return true;
+  // To enable this feature for testing pass "--gaia-profile-info".
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kGaiaProfileInfo)) {
+    return true;
+  }
+
+  // This feature is disable by default.
+  return false;
 }
 
 // static
 void GAIAInfoUpdateService::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterInt64Pref(
       prefs::kProfileGAIAInfoUpdateTime, 0, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(
       prefs::kProfileGAIAInfoPictureURL, "", PrefService::UNSYNCABLE_PREF);
 }
 
@@ skipping 112 matching lines @@
   const base::TimeDelta update_delta = base::Time::Now() - last_updated_;
 
   base::TimeDelta delta;
   if (update_delta < base::TimeDelta() || update_delta > desired_delta)
     delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds);
   else
     delta = desired_delta - update_delta;
 
   timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update);
 }