Relanding this as this did not fix the chromiumos breakage.

chrome/browser/sync/sync_ui_util_unittest.cc

Index: chrome/browser/sync/sync_ui_util_unittest.cc
===================================================================
--- chrome/browser/sync/sync_ui_util_unittest.cc	(revision 150400)
+++ chrome/browser/sync/sync_ui_util_unittest.cc	(working copy)
@@ -78,7 +78,7 @@
   scoped_ptr<Profile> profile(
       ProfileSyncServiceMock::MakeSignedInTestingProfile());
   NiceMock<ProfileSyncServiceMock> service(profile.get());
-  FakeSigninManager signin;
+  FakeSigninManager signin(profile.get());
   browser_sync::SyncBackendHost::Status status;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
@@ -99,7 +99,7 @@
   scoped_ptr<Profile> profile(
       ProfileSyncServiceMock::MakeSignedInTestingProfile());
   NiceMock<ProfileSyncServiceMock> service(profile.get());
-  FakeSigninManager signin;
+  FakeSigninManager signin(profile.get());
   browser_sync::SyncBackendHost::Status status;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
@@ -153,7 +153,7 @@
     { GoogleServiceAuthError::HOSTED_NOT_ALLOWED, true },
   };
 
-  FakeSigninManager signin;
+  FakeSigninManager signin(profile.get());
   for (size_t i = 0; i < sizeof(table)/sizeof(*table); ++i) {
     VerifySyncGlobalErrorResult(
         &service, signin, table[i].error_state, true, table[i].is_error);
Property changes on: chrome\browser\sync\sync_ui_util_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo