Relanding this as this did not fix the chromiumos breakage.

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
@@ skipping 323 matching lines @@
   virtual Profile* GetProfile() const OVERRIDE { return profile_; }
 
  private:
   // Weak pointer to parent profile.
   Profile* profile_;
   DISALLOW_COPY_AND_ASSIGN(TestingSyncSetupHandler);
 };
 
 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
 // or not.
 class SyncSetupHandlerTest : public testing::TestWithParam<bool> {
  public:
   SyncSetupHandlerTest() : error_(GoogleServiceAuthError::NONE) {}
   virtual void SetUp() OVERRIDE {
     // If the parameter is true, then use ClientOAuth for the tests.  Otherwise
     // use ClientLogin for the tests.
     if (GetParam()) {
       ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientOAuthSignin));
     } else {
       CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kDisableClientOAuthSignin);
     }
 
     error_ = GoogleServiceAuthError::None();
     profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile());
-    SyncPromoUI::RegisterUserPrefs(profile_->GetPrefs());
     mock_pss_ = static_cast<ProfileSyncServiceMock*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(),
             ProfileSyncServiceMock::BuildMockProfileSyncService));
     mock_signin_ = static_cast<SigninManagerMock*>(
         SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(), BuildSigninManagerMock));
     handler_.reset(new TestingSyncSetupHandler(&web_ui_, profile_.get()));
   }
 
@@ skipping 772 matching lines @@
   CheckShowSyncSetupArgs(
       dictionary, err, false, GoogleServiceAuthError::NONE, "", true, "");
   handler_->CloseSyncSetup();
   EXPECT_EQ(NULL,
             LoginUIServiceFactory::GetForProfile(
                 profile_.get())->current_login_ui());
 }
 
 INSTANTIATE_TEST_CASE_P(SyncSetupHandlerTest, SyncSetupHandlerTest,
                         Values(true, false));