Removing FRE UI for unicorn accounts.

chrome/browser/supervised_user/child_accounts/child_account_service.cc

 // Copyright 2014 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 "chrome/browser/supervised_user/child_accounts/child_account_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 91 matching lines @@
 }
 
 void ChildAccountService::Shutdown() {
   family_fetcher_.reset();
   CancelFetchingServiceFlags();
   SupervisedUserServiceFactory::GetForProfile(profile_)->SetDelegate(NULL);
   DCHECK(!active_);
   SigninManagerFactory::GetForProfile(profile_)->RemoveObserver(this);
 }
 
+void ChildAccountService::AddFlagFetchingObserver(
+    FlagsFetchingObserver* observer) {
+  observer_list_.AddObserver(observer);
+}
+
+void ChildAccountService::RemoveFlagFetchingObserver(
+    FlagsFetchingObserver* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
 bool ChildAccountService::SetActive(bool active) {
   if (!profile_->IsChild() && !active_)
     return false;
   if (active_ == active)
     return true;
   active_ = active;
 
   if (active_) {
     // In contrast to local SUs, child account SUs must sign in.
     scoped_ptr<base::Value> allow_signin(new base::FundamentalValue(true));
@@ skipping 138 matching lines @@
 
 void ChildAccountService::StartFetchingServiceFlags() {
   account_id_ = SigninManagerFactory::GetForProfile(profile_)
       ->GetAuthenticatedAccountId();
   flag_fetcher_.reset(new AccountServiceFlagFetcher(
       account_id_,
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
       profile_->GetRequestContext(),
       base::Bind(&ChildAccountService::OnFlagsFetched,
                  weak_ptr_factory_.GetWeakPtr())));
+
+  FOR_EACH_OBSERVER(FlagsFetchingObserver, observer_list_,
+                    OnFlagsFetchingStarted());
 }
 
 void ChildAccountService::CancelFetchingServiceFlags() {
   flag_fetcher_.reset();
   account_id_.clear();
   flag_fetch_timer_.Stop();
+  FOR_EACH_OBSERVER(FlagsFetchingObserver, observer_list_,
+                    OnFlagsFetchingCancelled());
 }
 
 void ChildAccountService::OnFlagsFetched(
     AccountServiceFlagFetcher::ResultCode result,
     const std::vector<std::string>& flags) {
   // If we've been signed out again (or signed in to a different account),
   // ignore the fetched flags.
   const std::string& new_account_id =
       SigninManagerFactory::GetForProfile(profile_)
           ->GetAuthenticatedAccountId();
   if (account_id_.empty() || account_id_ != new_account_id)
     return;
 
   account_id_.clear();
 
   // In case of an error, retry with exponential backoff.
   if (result != AccountServiceFlagFetcher::SUCCESS) {
     DLOG(WARNING) << "AccountServiceFlagFetcher returned error code " << result;
     flag_fetch_backoff_.InformOfRequest(false);
     ScheduleNextStatusFlagUpdate(flag_fetch_backoff_.GetTimeUntilRelease());
+    FOR_EACH_OBSERVER(FlagsFetchingObserver, observer_list_,
+                      OnFlagsFetchingError());
     return;
   }
 
   flag_fetch_backoff_.InformOfRequest(true);
 
   bool is_child_account =
       std::find(flags.begin(), flags.end(),
                 kIsChildAccountServiceFlagName) != flags.end();
+  FOR_EACH_OBSERVER(FlagsFetchingObserver, observer_list_,

[Marc Treib, 2015/03/04 09:59:15]

I'd only call the observers if is_child_account actually changed (so probably
move this into SetIsChildAccount).

[merkulova, 2015/03/04 10:06:27]

But we're actually waiting for the fetching to complete. No matter if the status
change happened.

[Marc Treib, 2015/03/04 10:17:53]

Right. We'd also want to notify the observers when the new
"is_child_account_status_known_" changes.

[merkulova, 2015/03/04 14:55:12]

Done.

+                    OnFlagsFetchingCompleted(is_child_account));
   SetIsChildAccount(is_child_account);
 
   ScheduleNextStatusFlagUpdate(
       base::TimeDelta::FromSeconds(kUpdateIntervalSeconds));
 }
 
 void ChildAccountService::ScheduleNextStatusFlagUpdate(base::TimeDelta delay) {
   flag_fetch_timer_.Start(
       FROM_HERE, delay, this, &ChildAccountService::StartFetchingServiceFlags);
 }
@@ skipping 67 matching lines @@
     command_line->AppendSwitch(switches::kEnableSupervisedUserBlacklist);
 
   // Query-based filtering also defaults to enabled.
   bool has_enable_safesites =
       command_line->HasSwitch(switches::kEnableSupervisedUserSafeSites);
   bool has_disable_safesites =
       command_line->HasSwitch(switches::kDisableSupervisedUserSafeSites);
   if (!has_enable_safesites && !has_disable_safesites)
     command_line->AppendSwitch(switches::kEnableSupervisedUserSafeSites);
 }