Revert 150232 (speculative, probably broke

LauncherFaviconLoaderBrowsertest.ChangeLauncherIcons
on cros bots) - Update favicon URLs on FinishLoad for main frame

Previously it was done on didStopLoading for _any_ frame.
That causes a stream of spurious favicon URL updates for
every <iframe>.
This is now moved to on didFinishLoad and get triggered only
for the main frame.  This ensures that icon loads always get
initiated after all of the other page resources have been
fetched.  Note that DidFinishDocumentLoad runs potentially
before all subresources have been fetched, which means that
the icon requests may compete with subresources for network
bandwidth.  didFinishLoad is the closest place to where
IconController does it, and we already have icons at this point.

BUG=131567

Review URL: https://chromiumcodereview.appspot.com/10831163

TBR=aruslan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10834201

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150277 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/chrome_render_view_observer.cc

@@ -698,21 +698,23 @@ void ChromeRenderViewObserver::DidStopLoading() {
         routing_id(), render_view()->GetPageId(), osd_url,
         search_provider::AUTODETECTED_PROVIDER));
   }
-}
-
-void ChromeRenderViewObserver::DidFinishLoad(WebKit::WebFrame* frame) {
-  if (frame->parent())
-    return;
 
-  // Please note that we are updating favicons only for the _main_ frame.
-  // Updating Favicon URLs at DidFinishLoad ensures that icon loads always get
-  // initiated after all of the other page resources have been fetched, so icon
-  // loads should not compete with page resources for network bandwidth.
   int icon_types = WebIconURL::TypeFavicon;
   if (chrome::kEnableTouchIcon)
     icon_types |= WebIconURL::TypeTouchPrecomposed | WebIconURL::TypeTouch;
 
-  CollectAndUpdateFaviconURLs(frame, icon_types);
+  WebVector<WebIconURL> icon_urls =
+      render_view()->GetWebView()->mainFrame()->iconURLs(icon_types);
+  std::vector<FaviconURL> urls;
+  for (size_t i = 0; i < icon_urls.size(); i++) {
+    WebURL url = icon_urls[i].iconURL();
+    if (!url.isEmpty())
+      urls.push_back(FaviconURL(url, ToFaviconType(icon_urls[i].iconType())));
+  }
+  if (!urls.empty()) {
+    Send(new IconHostMsg_UpdateFaviconURL(
+        routing_id(), render_view()->GetPageId(), urls));
+  }
 }
 
 void ChromeRenderViewObserver::DidChangeIcon(WebFrame* frame,
@@ -724,7 +726,14 @@ void ChromeRenderViewObserver::DidChangeIcon(WebFrame* frame,
       icon_type != WebIconURL::TypeFavicon)
     return;
 
-  CollectAndUpdateFaviconURLs(frame, icon_type);
+  WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_type);
+  std::vector<FaviconURL> urls;
+  for (size_t i = 0; i < icon_urls.size(); i++) {
+    urls.push_back(FaviconURL(icon_urls[i].iconURL(),
+                              ToFaviconType(icon_urls[i].iconType())));
+  }
+  Send(new IconHostMsg_UpdateFaviconURL(
+      routing_id(), render_view()->GetPageId(), urls));
 }
 
 void ChromeRenderViewObserver::DidCommitProvisionalLoad(
@@ -1089,21 +1098,6 @@ SkBitmap ChromeRenderViewObserver::ImageFromDataUrl(const GURL& url) const {
   return SkBitmap();
 }
 
-void ChromeRenderViewObserver::CollectAndUpdateFaviconURLs(
-    WebKit::WebFrame* frame, int icon_types) {
-  WebVector<WebIconURL> icon_urls = frame->iconURLs(icon_types);
-  std::vector<FaviconURL> urls;
-  for (size_t i = 0; i < icon_urls.size(); i++) {
-    WebURL url = icon_urls[i].iconURL();
-    if (!url.isEmpty())
-      urls.push_back(FaviconURL(url, ToFaviconType(icon_urls[i].iconType())));
-  }
-  if (!urls.empty()) {
-    Send(new IconHostMsg_UpdateFaviconURL(
-        routing_id(), render_view()->GetPageId(), urls));
-  }
-}
-
 bool ChromeRenderViewObserver::IsStrictSecurityHost(const std::string& host) {
   return (strict_security_hosts_.find(host) != strict_security_hosts_.end());
 }

chrome/renderer/chrome_render_view_observer.h

@@ -66,7 +66,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidStartLoading() OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
-  virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidChangeIcon(WebKit::WebFrame* frame,
                              WebKit::WebIconURL::Type icon_type) OVERRIDE;
   virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
@@ -185,9 +184,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
   // Decodes a data: URL image or returns an empty image in case of failure.
   SkBitmap ImageFromDataUrl(const GURL&) const;
 
-  // Collects favicons of given types from the frame and sends UpdateFaviconURL.
-  void CollectAndUpdateFaviconURLs(WebKit::WebFrame* frame, int icon_types);
-
   // Determines if a host is in the strict security host set.
   bool IsStrictSecurityHost(const std::string& host);