Remove GetDefaultProfile from various Android related code

chrome/browser/autofill/android/personal_data_manager_android.cc

 // Copyright 2013 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/autofill/android/personal_data_manager_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/format_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "jni/PersonalDataManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace autofill {
 namespace {
 
-Profile* GetDefaultProfile() {
-  return g_browser_process->profile_manager()->GetDefaultProfile();
-}
-
 PrefService* GetPrefs() {
-  return GetDefaultProfile()->GetOriginalProfile()->GetPrefs();
+  return
+      ProfileManager::GetActiveUserProfile()->GetOriginalProfile()->GetPrefs();
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
     JNIEnv* env,
     const AutofillProfile& profile) {
   return Java_AutofillProfile_create(
       env,
       ConvertUTF8ToJavaString(env, profile.guid()).obj(),
       ConvertUTF8ToJavaString(env, profile.origin()).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(NAME_FULL)).obj(),
@@ skipping 109 matching lines @@
   card->SetRawInfo(
       CREDIT_CARD_EXP_4_DIGIT_YEAR,
       ConvertJavaStringToUTF16(Java_CreditCard_getYear(env, jcard)));
 }
 
 }  // namespace
 
 PersonalDataManagerAndroid::PersonalDataManagerAndroid(JNIEnv* env,
                                                        jobject obj)
     : weak_java_obj_(env, obj),
-      personal_data_manager_(
-          PersonalDataManagerFactory::GetForProfile(GetDefaultProfile())) {
+      personal_data_manager_(PersonalDataManagerFactory::GetForProfile(
+          ProfileManager::GetActiveUserProfile())) {
   personal_data_manager_->AddObserver(this);
 }
 
 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
   personal_data_manager_->RemoveObserver(this);
 }
 
 jint PersonalDataManagerAndroid::GetProfileCount(JNIEnv* unused_env,
                                                  jobject unused_obj) {
   return personal_data_manager_->GetProfiles().size();
@@ skipping 136 matching lines @@
           g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill