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

trunk/src/chrome/browser/supervised_user/supervised_user_sync_service_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "sync/api/attachments/attachment_id.h"
 #include "sync/api/attachments/attachment_service_proxy_for_test.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.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 sync_pb::ManagedUserSpecifics;
 using syncer::SUPERVISED_USERS;
 using syncer::SyncChange;
 using syncer::SyncChangeList;
 using syncer::SyncChangeProcessor;
 using syncer::SyncData;
 using syncer::SyncDataList;
 using syncer::SyncError;
@@ skipping 252 matching lines @@
 }
 
 TEST_F(SupervisedUserSyncServiceTest, GetAvatarIndex) {
   int avatar = 100;
   EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(std::string(),
                                                         &avatar));
   EXPECT_EQ(SupervisedUserSyncService::kNoAvatar, avatar);
 
   int avatar_index = 4;
 #if defined(OS_CHROMEOS)
-  avatar_index += user_manager::kFirstDefaultImageIndex;
+  avatar_index += chromeos::kFirstDefaultImageIndex;
 #endif
   std::string avatar_str =
       SupervisedUserSyncService::BuildAvatarString(avatar_index);
 #if defined(OS_CHROMEOS)
   EXPECT_EQ(base::StringPrintf("chromeos-avatar-index:%d", avatar_index),
             avatar_str);
 #else
   EXPECT_EQ(base::StringPrintf("chrome-avatar-index:%d", avatar_index),
             avatar_str);
 #endif
   EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
   EXPECT_EQ(avatar_index, avatar);
 
   avatar_index = 0;
 #if defined(OS_CHROMEOS)
-  avatar_index += user_manager::kFirstDefaultImageIndex;
+  avatar_index += chromeos::kFirstDefaultImageIndex;
 #endif
   avatar_str = SupervisedUserSyncService::BuildAvatarString(avatar_index);
 #if defined(OS_CHROMEOS)
   EXPECT_EQ(base::StringPrintf("chromeos-avatar-index:%d", avatar_index),
             avatar_str);
 #else
   EXPECT_EQ(base::StringPrintf("chrome-avatar-index:%d", avatar_index),
             avatar_str);
 #endif
   EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
@@ skipping 36 matching lines @@
 
   EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
       "chrome-avatar-index:x",
       &avatar));
 
   EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
       "chromeos-avatar-index:5",
       &avatar));
 #endif
 }