Re-enable child account detection, now behind a flag.

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 220 matching lines @@
   ScheduleNextFamilyInfoUpdate(
       base::TimeDelta::FromSeconds(kUpdateIntervalSeconds));
 }
 
 void ChildAccountService::OnFailure(FamilyInfoFetcher::ErrorCode error) {
   DLOG(WARNING) << "GetFamilyMembers failed with code " << error;
   family_fetch_backoff_.InformOfRequest(false);
   ScheduleNextFamilyInfoUpdate(family_fetch_backoff_.GetTimeUntilRelease());
 }
 
+bool ChildAccountService::IsChildAccountDetectionEnabled() const {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  bool is_enabled =
+      command_line->HasSwitch(switches::kEnableChildAccountDetection);
+  bool is_disabled =
+      command_line->HasSwitch(switches::kDisableChildAccountDetection);
+  return is_enabled && !is_disabled;
+}
+
 void ChildAccountService::StartFetchingFamilyInfo() {
   family_fetcher_.reset(new FamilyInfoFetcher(
       this,
       SigninManagerFactory::GetForProfile(profile_)
           ->GetAuthenticatedAccountId(),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
       profile_->GetRequestContext()));
   family_fetcher_->StartGetFamilyMembers();
 }
 
 void ChildAccountService::CancelFetchingFamilyInfo() {
   family_fetcher_.reset();
   family_fetch_timer_.Stop();
 }
 
 void ChildAccountService::ScheduleNextFamilyInfoUpdate(base::TimeDelta delay) {
   family_fetch_timer_.Start(
       FROM_HERE, delay, this, &ChildAccountService::StartFetchingFamilyInfo);
 }
 
 void ChildAccountService::StartFetchingServiceFlags() {
+  if (!IsChildAccountDetectionEnabled()) {
+    SetIsChildAccount(false);
+    return;
+  }
   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())));
 }
 
 void ChildAccountService::CancelFetchingServiceFlags() {
   flag_fetcher_.reset();
   account_id_.clear();
   flag_fetch_timer_.Stop();
 }
 
 void ChildAccountService::OnFlagsFetched(
     AccountServiceFlagFetcher::ResultCode result,
@@ skipping 101 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);
 }