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 88f9118f19b0eeb301e584081ca1fbc75a2a8b77..3d49169011c974a77d3337cc1863f9ce475a2313 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 {
@@ -232,6 +234,10 @@ class UserSessionManager
   UserSessionManager();
   ~UserSessionManager() override;
 
+  // Milliseconds until we timeout our attempt to fetch flags from Child Account
+  // Service.
+  static const int kFlagsFetchingLoginTimeoutMs;

[Marc Treib, 2015/03/04 16:31:48]

I think there's no reason for this to be in the header, right? I'd just make it
a local constant in the .cc

[merkulova, 2015/03/04 19:06:49]

Done.

+
   // OAuth2LoginManager::Observer overrides:
   void OnSessionRestoreStateChanged(
       Profile* user_profile,
@@ -245,6 +251,13 @@ class UserSessionManager
   // Used when restoring user sessions after crash.
   void OnProfilePrepared(Profile* profile, bool browser_launched) override;
 
+  // ChildAccountStatusObserver override:
+  void OnChildAccountStatusChanged() override;
+
+  void OnStatusObservingCancelled();
+
+  void StopStatusObserving();
+
   void CreateUserSession(const UserContext& user_context,
                          bool has_auth_cookies);
   void PreStartSession();
@@ -413,6 +426,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 requesting_start_urls_;

[Marc Treib, 2015/03/04 16:31:48]

This name sounds like "we're currently requesting the start URLs". Maybe
"init_start_urls_was_postponed_"?

[merkulova, 2015/03/04 19:06:49]

Done.

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