Revert 207755 "Add device policies to control accessibility sett..."

trunk/src/chrome/browser/profiles/avatar_menu_model_unittest.cc

 // 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/avatar_menu_model.h"
 
-#include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 33 matching lines @@
   TestingProfileManager* manager() { return &manager_; }
 
  private:
   TestingProfileManager manager_;
 };
 
 TEST_F(AvatarMenuModelTest, InitialCreation) {
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
   MockObserver observer;
   EXPECT_EQ(0, observer.change_count());
 
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(0, observer.change_count());
 
   ASSERT_EQ(2U, model.GetNumberOfItems());
 
   const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
   EXPECT_EQ(0U, item1.model_index);
   EXPECT_EQ(name1, item1.name);
 
   const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
   EXPECT_EQ(1U, item2.model_index);
   EXPECT_EQ(name2, item2.name);
 }
 
 TEST_F(AvatarMenuModelTest, ActiveItem) {
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   ASSERT_EQ(2U, model.GetNumberOfItems());
   // TODO(jeremy): Expand test to verify active profile index other than 0
   // crbug.com/100871
   ASSERT_EQ(0U, model.GetActiveProfileIndex());
 }
 
 TEST_F(AvatarMenuModelTest, ModifyingNameResortsCorrectly) {
   string16 name1(ASCIIToUTF16("Alpha"));
   string16 name2(ASCIIToUTF16("Beta"));
   string16 newname1(ASCIIToUTF16("Gamma"));
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(0, observer.change_count());
 
   ASSERT_EQ(2U, model.GetNumberOfItems());
 
   const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
   EXPECT_EQ(0U, item1.model_index);
   EXPECT_EQ(name1, item1.name);
@@ skipping 12 matching lines @@
 
   const AvatarMenuModel::Item& item2next = model.GetItemAt(1);
   EXPECT_EQ(1U, item2next.model_index);
   EXPECT_EQ(newname1, item2next.name);
 }
 
 TEST_F(AvatarMenuModelTest, ChangeOnNotify) {
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
   MockObserver observer;
   EXPECT_EQ(0, observer.change_count());
 
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(0, observer.change_count());
   EXPECT_EQ(2U, model.GetNumberOfItems());
 
   string16 name3(ASCIIToUTF16("Test 3"));
-  manager()->CreateTestingProfile("p3", scoped_ptr<PrefServiceSyncable>(),
-                                  name3, 0);
+  manager()->CreateTestingProfile("p3", name3, 0);
 
   // Four changes happened via the call to CreateTestingProfile: adding the
   // profile to the cache, setting the user name, rebuilding the list of
   // profiles after the name change, and changing the avatar.
   // On Windows, an extra change happens to set the shortcut name for the
   // profile.
   EXPECT_GE(observer.change_count(), 4);
   ASSERT_EQ(3U, model.GetNumberOfItems());
 
   const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
@@ skipping 20 matching lines @@
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 #else
   EXPECT_TRUE(AvatarMenuModel::ShouldShowAvatarMenu());
 #endif
 }
 
 TEST_F(AvatarMenuModelTest, DontShowAvatarMenu) {
   string16 name1(ASCIIToUTF16("Test 1"));
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
 
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 
   // If multiprofile mode is enabled, there are no other cases when we wouldn't
   // show the menu.
   if (ProfileManager::IsMultipleProfilesEnabled())
     return;
 
   string16 name2(ASCIIToUTF16("Test 2"));
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 }
 
 TEST_F(AvatarMenuModelTest, ShowAvatarMenu) {
   // If multiprofile mode is not enabled then the menu is never shown.
   if (!ProfileManager::IsMultipleProfilesEnabled())
     return;
 
   string16 name1(ASCIIToUTF16("Test 1"));
   string16 name2(ASCIIToUTF16("Test 2"));
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  name1, 0);
-  manager()->CreateTestingProfile("p2", scoped_ptr<PrefServiceSyncable>(),
-                                  name2, 0);
+  manager()->CreateTestingProfile("p1", name1, 0);
+  manager()->CreateTestingProfile("p2", name2, 0);
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenuModel::ShouldShowAvatarMenu());
 #else
   EXPECT_TRUE(AvatarMenuModel::ShouldShowAvatarMenu());
 #endif
 }
 
 TEST_F(AvatarMenuModelTest, SyncState) {
   // If multiprofile mode is not enabled then the menu is never shown.
   if (!ProfileManager::IsMultipleProfilesEnabled())
     return;
 
-  manager()->CreateTestingProfile("p1", scoped_ptr<PrefServiceSyncable>(),
-                                  ASCIIToUTF16("Test 1"), 0);
+  manager()->CreateTestingProfile("p1", ASCIIToUTF16("Test 1"), 0);
 
   // Add a managed user profile.
   ProfileInfoCache* cache = manager()->profile_info_cache();
   manager()->profile_info_cache()->AddProfileToCache(
       cache->GetUserDataDir().AppendASCII("p2"), ASCIIToUTF16("Test 2"),
       string16(), 0, true);
   MockObserver observer;
   AvatarMenuModel model(manager()->profile_info_cache(), &observer, browser());
   EXPECT_EQ(2U, model.GetNumberOfItems());
 
   // Now check that the sync_state of a managed user shows the managed user
   // avatar label instead.
   base::string16 managed_user_label =
       l10n_util::GetStringUTF16(IDS_MANAGED_USER_AVATAR_LABEL);
   const AvatarMenuModel::Item& item1 = model.GetItemAt(0);
   EXPECT_NE(item1.sync_state, managed_user_label);
 
   const AvatarMenuModel::Item& item2 = model.GetItemAt(1);
   EXPECT_EQ(item2.sync_state, managed_user_label);
 }
 
 }  // namespace