Revert 150232 (speculative, probably broke

chrome/renderer/chrome_render_view_observer.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_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 48 matching lines @@
     string16 frame_xpath;
     string16 jscript;
     int id;
     bool notify_result;
   };
 
   // RenderViewObserver implementation.
   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,
                                         bool is_new_navigation) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) OVERRIDE;
 
   // WebKit::WebPermissionClient implementation.
   virtual bool allowDatabase(WebKit::WebFrame* frame,
                              const WebKit::WebString& name,
@@ skipping 98 matching lines @@
   // request was successfully started, false otherwise. id is used to
   // uniquely identify the request and passed back to the
   // DidDownloadFavicon method. If the image has multiple frames, the
   // frame whose size is image_size is returned. If the image doesn't
   // have a frame at the specified size, the first is returned.
   bool DownloadFavicon(int id, const GURL& image_url, int image_size);
 
   // 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);
 
   // Checks if |origin| correponds to an installed extension that has been
   // granted the |permission|.
   bool HasExtensionPermission(const WebKit::WebSecurityOrigin& origin,
                               extensions::APIPermission::ID permission) const;
 
   // Save the JavaScript to preload if a ViewMsg_WebUIJavaScript is received.
   scoped_ptr<WebUIJavaScript> webui_javascript_;
@@ skipping 33 matching lines @@
   // A color page overlay when visually de-emaphasized.
   scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_;
 
   // Used to delay calling CapturePageInfo.
   base::Timer capture_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver);
 };
 
 #endif  // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_