Refactor FaviconDriver::OnFaviconAvailable()

chrome/browser/android/tab_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
@@ skipping 131 matching lines @@
   // Overridden from SearchTabHelperDelegate:
   void OnWebContentsInstantSupportDisabled(
       const content::WebContents* web_contents) override;
 
   // Overridden from NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Overridden from favicon::FaviconDriverObserver:
-  void OnFaviconAvailable(const gfx::Image& image) override;
   void OnFaviconUpdated(favicon::FaviconDriver* favicon_driver,
-                        bool icon_url_changed) override;
+                        NotificationIconType notification_icon_type,
+                        const GURL& icon_url,
+                        bool icon_url_changed,
+                        const gfx::Image& image) override;
 
   // Methods called from Java via JNI -----------------------------------------
 
   void Destroy(JNIEnv* env, jobject obj);
   void InitWebContents(JNIEnv* env,
                        jobject obj,
                        jboolean incognito,
                        jobject jcontent_view_core,
                        jobject jweb_contents_delegate,
                        jobject jcontext_menu_populator);
@@ skipping 93 matching lines @@
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<chrome::android::TabWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_