Relanding this as this did not fix the chromiumos breakage.

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
===================================================================
--- chrome/browser/ui/webui/sync_setup_handler_unittest.cc	(revision 150400)
+++ chrome/browser/ui/webui/sync_setup_handler_unittest.cc	(working copy)
@@ -341,12 +341,12 @@
 
 class SigninManagerMock : public FakeSigninManager {
  public:
-  SigninManagerMock() {}
+  explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {}
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
 static ProfileKeyedService* BuildSigninManagerMock(Profile* profile) {
-  return new SigninManagerMock();
+  return new SigninManagerMock(profile);
 }
 
 // The boolean parameter indicates whether the test is run with ClientOAuth
@@ -367,7 +367,6 @@
 
     error_ = GoogleServiceAuthError::None();
     profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile());
-    SyncPromoUI::RegisterUserPrefs(profile_->GetPrefs());
     mock_pss_ = static_cast<ProfileSyncServiceMock*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(),
Property changes on: chrome\browser\ui\webui\sync_setup_handler_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo