NOT FOR REVIEW: Aura on Android

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/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 #include "base/android/jni_android.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
 const char kChildAccountDetectionFieldTrialName[] = "ChildAccountDetection";
@@ skipping 76 matching lines @@
 
   for (const auto& callback : status_received_callback_list_)
     callback.Run();
   status_received_callback_list_.clear();
 }
 
 void ChildAccountService::Init() {
   SupervisedUserServiceFactory::GetForProfile(profile_)->SetDelegate(this);
   AccountTrackerServiceFactory::GetForProfile(profile_)->AddObserver(this);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   bool is_child_account = false;
   if (GetJavaChildAccountStatus(&is_child_account))
     SetIsChildAccount(is_child_account);
 #endif
 
   PropagateChildStatusToUser(profile_->IsChild());
 
   // If we're already signed in, check the account immediately just to be sure.
   // (We might have missed an update before registering as an observer.)
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile_);
@@ skipping 193 matching lines @@
 }
 
 void ChildAccountService::ClearSecondCustodianPrefs() {
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianName);
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianEmail);
   profile_->GetPrefs()->ClearPref(
       prefs::kSupervisedUserSecondCustodianProfileURL);
   profile_->GetPrefs()->ClearPref(
       prefs::kSupervisedUserSecondCustodianProfileImageURL);
 }