Index: trunk/src/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm |
=================================================================== |
--- trunk/src/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm (revision 207797) |
+++ trunk/src/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm (working copy) |
@@ -7,7 +7,6 @@ |
#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" |
@@ -28,10 +27,8 @@ |
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); |
@@ -119,8 +116,7 @@ |
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]; |