[Mirror Android] Do not return "old style" avatar icons.

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"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "jni/ProfileDownloader_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 
 namespace {
@@ skipping 107 matching lines @@
 jobject GetCachedAvatarForPrimaryAccount(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());
 
   ScopedJavaLocalRef<jobject> jbitmap;
   if (index != std::string::npos) {
-    const gfx::Image& img = info.GetAvatarIconOfProfileAtIndex(index);
-    if (!img.IsEmpty() && img.AsImageSkia().bitmap())
-      jbitmap = gfx::ConvertToJavaBitmap(img.AsImageSkia().bitmap());
+    gfx::Image avatar_image = info.GetAvatarIconOfProfileAtIndex(index);
+    if (!avatar_image.IsEmpty() &&
+        avatar_image.Width() > profiles::kAvatarIconWidth &&
+        avatar_image.Height() > profiles::kAvatarIconHeight &&
+        avatar_image.AsImageSkia().bitmap()) {
+      jbitmap = gfx::ConvertToJavaBitmap(avatar_image.AsImageSkia().bitmap());
+    }
   }
 
   return jbitmap.Release();
 }
 
 // static
 void StartFetchingAccountInfoFor(
     JNIEnv* env,
     jclass clazz,
     jobject jprofile,
     jstring jaccount_id,
     jint image_side_pixels) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   const std::string account_id =
       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);
 }