Enable GAIA profile info downloader by default

BUG=91241
TEST=


Review URL: http://codereview.chromium.org/8743007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112368 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/gaia_info_update_service.cc

@@ -4,7 +4,6 @@
 
 #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"
@@ -12,7 +11,6 @@
 #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"
@@ -65,12 +63,6 @@ bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) {
   if (!profile->GetOriginalProfile()->IsSyncAccessible())
     return false;
 
-  // TODO(sail): For now put this feature behind a flag.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kGaiaProfileInfo)) {
-    return false;
-  }
-
   return true;
 }
 

chrome/browser/profiles/gaia_info_update_service_unittest.cc

@@ -153,8 +153,9 @@ TEST_F(GAIAInfoUpdateServiceTest, NoMigration) {
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, ShouldUseGAIAProfileInfo) {
-  // Currently this is disabled by default.
-  EXPECT_FALSE(GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(profile()));
+  bool sync_enabled = profile()->GetOriginalProfile()->IsSyncAccessible();
+  EXPECT_EQ(sync_enabled,
+            GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(profile()));
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, ScheduleUpdate) {

chrome/common/chrome_switches.cc

@@ -642,9 +642,6 @@ const char kForceCompositingMode[]          = "force-compositing-mode";
 // omitted. The default value is "www.google.com".
 const char kGaiaHost[]                       = "gaia-host";
 
-// Enables using GAIA information to populate profile name and icon.
-const char kGaiaProfileInfo[]                = "gaia-profile-info";
-
 // Specifies a custom name for the GSSAPI library to load.
 const char kGSSAPILibraryName[]             = "gssapi-library-name";
 

chrome/common/chrome_switches.h

@@ -182,7 +182,6 @@ extern const char kFirstRun[];
 extern const char kForceAppsPromoVisible[];
 extern const char kForceCompositingMode[];
 extern const char kGaiaHost[];
-extern const char kGaiaProfileInfo[];
 extern const char kGSSAPILibraryName[];
 extern const char kHelp[];
 extern const char kHelpShort[];