Relanding this as this did not fix the chromiumos breakage.

chrome/browser/ui/sync/one_click_signin_helper_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 "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 17 matching lines @@
 using ::testing::_;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::Values;
 
 namespace {
 
 class SigninManagerMock : public FakeSigninManager {
  public:
-  SigninManagerMock() {}
+  explicit SigninManagerMock(Profile* profile)
+      : FakeSigninManager(profile) {}
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
 class OneClickSigninHelperTest : public content::RenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
 
   virtual void SetUp() OVERRIDE;
 
  protected:
@@ skipping 22 matching lines @@
     : ui_thread_(content::BrowserThread::UI, &message_loop_) {
 }
 
 void OneClickSigninHelperTest::SetUp() {
   // Don't call base class so that default browser context and test WebContents
   // are not created now.  They will be created in CreateMockWebContents()
   // as needed.
 }
 
 static ProfileKeyedService* BuildSigninManagerMock(Profile* profile) {
-  return new SigninManagerMock();
+  return new SigninManagerMock(profile);
 }
 
 content::WebContents* OneClickSigninHelperTest::CreateMockWebContents(
     bool use_incognito,
     const std::string& username) {
   TestingProfile* testing_profile = new TestingProfile();
   browser_context_.reset(testing_profile);
 
   testing_profile->set_incognito(use_incognito);
   signin_manager_ = static_cast<SigninManagerMock*>(
@@ skipping 116 matching lines @@
   content::WebContents* web_contents = CreateMockWebContents(false, "");
   AllowSigninCookies(false);
 
   EXPECT_CALL(*signin_manager_, IsAllowedUsername(_)).
         WillRepeatedly(Return(true));
 
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "user@gmail.com",
                                               true));
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, "", false));
 }