Removed "disable-user-image-sync" switch.

BUG=361084

Review URL: https://codereview.chromium.org/225413022

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

chrome/app/generated_resources.grd

@@ -6819,12 +6819,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Positions the app launcher in the center of the screen with a landscape aspect. This will not enable other app launcher experiments.
         </message>
       </if>
-      <message name="IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME" desc="Name of the flag to disable sync of user account image.">
-        Disable avatar sync.
-      </message>
-      <message name="IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION" desc="Description for the flag to disable sync of user account image.">
-        Disables sync of user account image between different ChromeOS devices.
-      </message>
       <if expr="chromeos">
         <message name="IDS_FLAGS_DISABLE_FIRST_RUN_UI_NAME" desc="Name of the flag to disable new first-run UI.">
           Disable new first-run UI.

chrome/browser/about_flags.cc

@@ -1522,15 +1522,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo)
   },
 #endif
-#if defined(OS_CHROMEOS)
-  {
-    "disable-user-image-sync",
-    IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME,
-    IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION,
-    kOsCrOS,
-    SINGLE_VALUE_TYPE(chromeos::switches::kDisableUserImageSync)
-  },
-#endif
 #if defined(OS_ANDROID)
   {
     "enable-accessibility-tab-switcher",

chrome/browser/chromeos/login/user_image_manager_impl.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ -33,7 +32,6 @@
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
-#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "policy/policy_constants.h"
@@ -982,9 +980,7 @@ void UserImageManagerImpl::TryToCreateImageSyncObserver() {
   // must not be started so that the policy-set image does not get synced out.
   if (!user_image_sync_observer_ &&
       user && user->CanSyncImage() &&
-      !IsUserImageManaged() &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kDisableUserImageSync)) {
+      !IsUserImageManaged()) {
     user_image_sync_observer_.reset(new UserImageSyncObserver(user));
   }
 }

chromeos/chromeos_switches.cc

@@ -183,9 +183,6 @@ const char kSmsTestMessages[]               = "sms-test-messages";
 // This option is for testing the chromeos build of chrome on the desktop only.
 const char kStubCrosSettings[]              = "stub-cros-settings";
 
-// Disables user image sync.
-const char kDisableUserImageSync[]          = "disable-user-image-sync";
-
 // Disables SAML sigin support.
 const char kDisableSamlSignin[]             = "disable-saml-signin";
 

chromeos/chromeos_switches.h

@@ -66,7 +66,6 @@ CHROMEOS_EXPORT extern const char kShillStub[];
 CHROMEOS_EXPORT extern const char kSkipHWIDCheck[];
 CHROMEOS_EXPORT extern const char kSmsTestMessages[];
 CHROMEOS_EXPORT extern const char kStubCrosSettings[];
-CHROMEOS_EXPORT extern const char kDisableUserImageSync[];
 CHROMEOS_EXPORT extern const char kDisableFirstRunUI[];
 CHROMEOS_EXPORT extern const char kForceFirstRunUI[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];