Relanding this as this did not fix the chromiumos breakage.

chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Index: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
===================================================================
--- chrome/browser/ui/sync/one_click_signin_helper_unittest.cc	(revision 150400)
+++ chrome/browser/ui/sync/one_click_signin_helper_unittest.cc	(working copy)
@@ -35,7 +35,8 @@
 
 class SigninManagerMock : public FakeSigninManager {
  public:
-  SigninManagerMock() {}
+  explicit SigninManagerMock(Profile* profile)
+      : FakeSigninManager(profile) {}
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
@@ -78,7 +79,7 @@
 }
 
 static ProfileKeyedService* BuildSigninManagerMock(Profile* profile) {
-  return new SigninManagerMock();
+  return new SigninManagerMock(profile);
 }
 
 content::WebContents* OneClickSigninHelperTest::CreateMockWebContents(
Property changes on: chrome\browser\ui\sync\one_click_signin_helper_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo