Implementation of GetFavicon for current tab.

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 baa0a000cb2aeef6856c7b08386b17534184d8da..592dc60ae29a0dd6b211b0c86b78873e3b263192 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ -47,6 +48,9 @@
 #include "content/public/browser/web_contents.h"
 #include "jni/Tab_jni.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "ui/gfx/android/java_bitmap.h"
+
+using gfx::ConvertToJavaBitmap;
 
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
@@ -517,6 +521,22 @@ bool TabAndroid::Print(JNIEnv* env, jobject obj) {
   return true;
 }
 
+ScopedJavaLocalRef<jobject> TabAndroid::GetCurrentTabFavicon(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;
+
+  const SkBitmap& favicon = favicon_tab_helper->GetFavicon().AsBitmap();
+  if(favicon.getSize() > 0)
+    bitmap = ConvertToJavaBitmap(&favicon);
+
+  return bitmap;
+}
+
 prerender::PrerenderManager* TabAndroid::GetPrerenderManager() const {
   Profile* profile = GetProfile();
   if (!profile)