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

trunk/src/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/message_loop/message_pump_mac.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/test/cocoa_test_event_utils.h"
 
 class AvatarMenuBubbleControllerTest : public CocoaTest {
  public:
   AvatarMenuBubbleControllerTest()
       : manager_(TestingBrowserProcess::GetGlobal()) {
   }
 
   virtual void SetUp() {
     CocoaTest::SetUp();
     ASSERT_TRUE(manager_.SetUp());
 
-    manager_.CreateTestingProfile("test1", scoped_ptr<PrefServiceSyncable>(),
-                                  ASCIIToUTF16("Test 1"), 1);
-    manager_.CreateTestingProfile("test2", scoped_ptr<PrefServiceSyncable>(),
-                                  ASCIIToUTF16("Test 2"), 0);
+    manager_.CreateTestingProfile("test1", ASCIIToUTF16("Test 1"), 1);
+    manager_.CreateTestingProfile("test2", ASCIIToUTF16("Test 2"), 0);
 
     model_ = new AvatarMenuModel(manager_.profile_info_cache(), NULL, NULL);
 
     NSRect frame = [test_window() frame];
     NSPoint point = NSMakePoint(NSMidX(frame), NSMidY(frame));
     controller_ =
         [[AvatarMenuBubbleController alloc] initWithModel:model()
                                              parentWindow:test_window()
                                                anchoredAt:point];
   }
@@ skipping 67 matching lines @@
 
 TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {
   [controller() showWindow:nil];
 
   NSView* contents = [[controller() window] contentView];
   EXPECT_EQ(4U, [[contents subviews] count]);
 
   scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);
 
   // Now create a new profile and notify the delegate.
-  manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
-                                  ASCIIToUTF16("Test 3"), 0);
+  manager()->CreateTestingProfile("test3", ASCIIToUTF16("Test 3"), 0);
 
   // Testing the bridge is not worth the effort...
   [controller() performLayout];
 
   EXPECT_EQ(5U, [[contents subviews] count]);
 
   // Make sure that none of the old items exit.
   NSArray* newItems = [controller() items];
   for (AvatarMenuItemController* oldVC in oldItems.get()) {
     EXPECT_FALSE([newItems containsObject:oldVC]);
@@ skipping 119 matching lines @@
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:0], GetHighlightedItem());
 
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 
   // There are no more items now so going up should stay at the first item.
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 }