Removing FRE UI for unicorn accounts.

chrome/browser/chromeos/login/session/user_session_manager.h

Index: chrome/browser/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index 581847f7ba6fc56d5ef97df7f99b62602c975bcd..cdb494d053feee18c27148cea96cb2fca7c2253d 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -15,6 +15,7 @@
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
+#include "chrome/browser/supervised_user/child_accounts/child_account_status_observer.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/authenticator.h"
 #include "chromeos/login/auth/user_context.h"
@@ -75,7 +76,8 @@ class UserSessionManager
       public net::NetworkChangeNotifier::ConnectionTypeObserver,
       public base::SupportsWeakPtr<UserSessionManager>,
       public UserSessionManagerDelegate,
-      public user_manager::UserManager::UserSessionStateObserver {
+      public user_manager::UserManager::UserSessionStateObserver,
+      public ChildAccountStatusObserver {
  public:
   // Context of StartSession calls.
   typedef enum {
@@ -247,6 +249,11 @@ class UserSessionManager
   // Used when restoring user sessions after crash.
   void OnProfilePrepared(Profile* profile, bool browser_launched) override;
 
+  // ChildAccountStatusObserver override:
+  void OnChildAccountStatusChanged(bool is_child) override;
+
+  void StopStatusObserving();
+
   void CreateUserSession(const UserContext& user_context,
                          bool has_auth_cookies);
   void PreStartSession();
@@ -412,6 +419,12 @@ class UserSessionManager
   // Whether should launch browser, tests may override this value.
   bool should_launch_browser_;
 
+  // Whether we have postponed request for InitializeStartUrls call.
+  bool init_start_urls_was_postponed_;
+  Profile* profile_fetching_flags_;

[Bernhard Bauer, 2015/03/10 09:55:12]

Nit: this variable name reads to me like it stores the flags for profile
fetching. Maybe rename it to |flag_fetching_profile_|?

[Marc Treib, 2015/03/10 10:43:34]

It probably shouldn't talk about "flag fetching" at all, since that's really an
implementation detail of the CAService. I don't have a good suggestion though...

[merkulova, 2015/03/10 11:53:57]

Done.

+
+  base::WeakPtrFactory<UserSessionManager> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
 };