Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5694)

Unified Diff: chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm

Issue 16658015: Add device policies to control accessibility settings on the login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copy&paste mistake found by clang. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
index 45863edea7d018275e5fdc4fe42c24c14f0489f9..f4dc8577b7d03db23ce12aea821ab4416ab3b940 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller_unittest.mm
@@ -7,6 +7,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/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"
@@ -27,8 +28,10 @@ class AvatarMenuBubbleControllerTest : public CocoaTest {
CocoaTest::SetUp();
ASSERT_TRUE(manager_.SetUp());
- manager_.CreateTestingProfile("test1", ASCIIToUTF16("Test 1"), 1);
- manager_.CreateTestingProfile("test2", ASCIIToUTF16("Test 2"), 0);
+ manager_.CreateTestingProfile("test1", scoped_ptr<PrefServiceSyncable>(),
+ ASCIIToUTF16("Test 1"), 1);
+ manager_.CreateTestingProfile("test2", scoped_ptr<PrefServiceSyncable>(),
+ ASCIIToUTF16("Test 2"), 0);
model_ = new AvatarMenuModel(manager_.profile_info_cache(), NULL, NULL);
@@ -116,7 +119,8 @@ TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {
scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);
// Now create a new profile and notify the delegate.
- manager()->CreateTestingProfile("test3", ASCIIToUTF16("Test 3"), 0);
+ manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
+ ASCIIToUTF16("Test 3"), 0);
// Testing the bridge is not worth the effort...
[controller() performLayout];

Powered by Google App Engine
This is Rietveld 408576698