Relanding this as this did not fix the chromiumos breakage.

chrome/browser/signin/signin_manager.h

Index: chrome/browser/signin/signin_manager.h
===================================================================
--- chrome/browser/signin/signin_manager.h	(revision 150400)
+++ chrome/browser/signin/signin_manager.h	(working copy)
@@ -140,6 +140,11 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+ protected:
+  // Weak pointer to parent profile (protected so FakeSigninManager can access
+  // it).
+  Profile* profile_;
+
  private:
   enum SigninType {
     SIGNIN_TYPE_NONE,
@@ -173,8 +178,6 @@
   void HandleAuthError(const GoogleServiceAuthError& error,
                        bool clear_transient_data);
 
-  Profile* profile_;
-
   // ClientLogin identity.
   std::string possibly_invalid_username_;
   std::string password_;  // This is kept empty whenever possible.
Property changes on: chrome\browser\signin\signin_manager.h
___________________________________________________________________
Added: svn:mergeinfo