Some favicon cleanup/upstreaming

chrome/browser/android/tab_android.cc

 // Copyright (c) 2012 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/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
@@ skipping 585 matching lines @@
   return true;
 }
 
 ScopedJavaLocalRef<jobject> TabAndroid::GetFavicon(JNIEnv* env, jobject obj) {
   ScopedJavaLocalRef<jobject> bitmap;
   FaviconTabHelper* favicon_tab_helper =
       FaviconTabHelper::FromWebContents(web_contents_.get());
 
   if (!favicon_tab_helper)
     return bitmap;
-  if (!favicon_tab_helper->FaviconIsValid())
-    return bitmap;
+
+  // If the favicon isn't valid, it will return a default bitmap.
 
   SkBitmap favicon =
       favicon_tab_helper->GetFavicon()
           .AsImageSkia()
           .GetRepresentation(
                ResourceBundle::GetSharedInstance().GetMaxScaleFactor())
           .sk_bitmap();
 
   if (favicon.empty()) {
     favicon = favicon_tab_helper->GetFavicon().AsBitmap();
@@ skipping 10 matching lines @@
                                         skia::ImageOperations::RESIZE_BEST,
                                         target_size_dip,
                                         target_size_dip);
     }
 
     bitmap = gfx::ConvertToJavaBitmap(&favicon);
   }
   return bitmap;
 }
 
+jboolean TabAndroid::IsFaviconValid(JNIEnv* env, jobject jobj) {
+  return web_contents() &&
+      FaviconTabHelper::FromWebContents(web_contents())->FaviconIsValid();
+}
+
 prerender::PrerenderManager* TabAndroid::GetPrerenderManager() const {
   Profile* profile = GetProfile();
   if (!profile)
     return NULL;
   return prerender::PrerenderManagerFactory::GetForProfile(profile);
 }
 
 static void Init(JNIEnv* env, jobject obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }