Some favicon cleanup/upstreaming

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 0e40ea06c81f9cf24afb65a8a8f3d6a1f696f03b..9c228e52bd3a473f50d353433e4bedcdd7c9519a 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -603,8 +603,8 @@ ScopedJavaLocalRef<jobject> TabAndroid::GetFavicon(JNIEnv* env, jobject obj) {
 
   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()
@@ -635,6 +635,11 @@ ScopedJavaLocalRef<jobject> TabAndroid::GetFavicon(JNIEnv* env, jobject obj) {
   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)