[Mirror] Fix wrong logic in GetCachedNameForPrimaryAccount

chrome/browser/android/profiles/profile_downloader_android.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/android/profiles/profile_downloader_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_android.h"
@@ skipping 98 matching lines @@
 // static
 jstring GetCachedNameForPrimaryAccount(JNIEnv* env,
                                        jclass clazz,
                                        jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   ProfileInfoInterface& info =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t index = info.GetIndexOfProfileWithPath(profile->GetPath());
 
   base::string16 name;
-
-  if (index != std::string::npos &&
-      !info.ProfileIsUsingDefaultNameAtIndex(index)) {
+  if (index != std::string::npos)
     name = info.GetGAIANameOfProfileAtIndex(index);
-    if (name.empty())
-      name = info.GetNameOfProfileAtIndex(index);
-  }
 
   return base::android::ConvertUTF16ToJavaString(env, name).Release();
 }
 
 // static
 jobject GetCachedAvatarForPrimaryAccount(JNIEnv* env,
                                          jclass clazz,
                                          jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   ProfileInfoInterface& info =
@@ skipping 26 matching lines @@
       base::android::ConvertJavaStringToUTF8(env, jaccount_id);
   AccountInfoRetriever* retriever =
       new AccountInfoRetriever(profile, account_id, image_side_pixels);
   retriever->Start();
 }
 
 // static
 bool ProfileDownloaderAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }