Revert 284417 "Move default user profile images strings and reso..."

trunk/src/chrome/browser/supervised_user/supervised_user_sync_service.cc

 // Copyright 2014 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/supervised_user/supervised_user_sync_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/sync_merge_result.h"
 #include "sync/protocol/sync.pb.h"
 
 #if defined(OS_CHROMEOS)
-#include "components/user_manager/user_image/default_user_images.h"
+#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
 #endif
 
 using base::DictionaryValue;
 using user_prefs::PrefRegistrySyncable;
 using syncer::SUPERVISED_USERS;
 using syncer::ModelType;
 using syncer::SyncChange;
 using syncer::SyncChangeList;
 using syncer::SyncChangeProcessor;
 using syncer::SyncData;
@@ skipping 124 matching lines @@
     return false;
   }
 
   if (!base::StringToInt(avatar_str.substr(prefix_len), avatar_index))
     return false;
 
   const int kChromeOSDummyAvatarIndex = -111;
 
 #if defined(OS_CHROMEOS)
   return (*avatar_index == kChromeOSDummyAvatarIndex ||
-          (*avatar_index >= user_manager::kFirstDefaultImageIndex &&
-           *avatar_index < user_manager::kDefaultImagesCount));
+          (*avatar_index >= chromeos::kFirstDefaultImageIndex &&
+           *avatar_index < chromeos::kDefaultImagesCount));
 #else
   // Check if the Chrome avatar index is set to a dummy value. Some early
   // supervised user profiles on ChromeOS stored a dummy avatar index as a
   // Chrome Avatar before there was logic to sync the ChromeOS avatar
   // separately. Handle this as if the Chrome Avatar was not chosen yet (which
   // is correct for these profiles).
   if (*avatar_index == kChromeOSDummyAvatarIndex)
     *avatar_index = kNoAvatar;
   return (*avatar_index == kNoAvatar ||
           (*avatar_index >= 0 &&
@@ skipping 387 matching lines @@
 
 void SupervisedUserSyncService::DispatchCallbacks() {
   const base::DictionaryValue* supervised_users =
       prefs_->GetDictionary(prefs::kSupervisedUsers);
   for (std::vector<SupervisedUsersCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end(); ++it) {
     it->Run(supervised_users);
   }
   callbacks_.clear();
 }