Revert 107645 (To see if it was responsible for increase in static initializers) - Fix test snaps...

chrome/browser/automation/automation_provider_observers.h

Index: chrome/browser/automation/automation_provider_observers.h
===================================================================
--- chrome/browser/automation/automation_provider_observers.h	(revision 107646)
+++ chrome/browser/automation/automation_provider_observers.h	(working copy)
@@ -1343,13 +1343,13 @@
   DISALLOW_COPY_AND_ASSIGN(SavePackageNotificationObserver);
 };
 
-// This class manages taking a snapshot of a page.
-class PageSnapshotTaker : public TabEventObserver,
-                          public content::NotificationObserver {
+// This class manages taking a snapshot of a page. This requires waiting on
+// asynchronous callbacks and notifications.
+class PageSnapshotTaker : public DomOperationObserver {
  public:
   PageSnapshotTaker(AutomationProvider* automation,
                     IPC::Message* reply_message,
-                    TabContentsWrapper* tab_contents,
+                    RenderViewHost* render_view,
                     const FilePath& path);
   virtual ~PageSnapshotTaker();
 
@@ -1357,24 +1357,26 @@
   void Start();
 
  private:
-  // TabEventObserver overrides.
-  virtual void OnSnapshotEntirePageACK(
-      bool success,
-      const std::vector<unsigned char>& png_data,
-      const std::string& error_msg) OVERRIDE;
-  // NotificationObserver overrides.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+  // Overriden from DomOperationObserver.
+  virtual void OnDomOperationCompleted(const std::string& json) OVERRIDE;
+  virtual void OnModalDialogShown() OVERRIDE;
 
+  // Called by the ThumbnailGenerator when the requested snapshot has been
+  // generated.
+  void OnSnapshotTaken(const SkBitmap& bitmap);
+
+  // Helper method to send arbitrary javascript to the renderer for evaluation.
+  void ExecuteScript(const std::wstring& javascript);
+
   // Helper method to send a response back to the client. Deletes this.
   void SendMessage(bool success, const std::string& error_msg);
 
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
-  TabContentsWrapper* tab_contents_;
+  RenderViewHost* render_view_;
   FilePath image_path_;
-  content::NotificationRegistrar registrar_;
+  bool received_width_;
+  gfx::Size entire_page_size_;
 
   DISALLOW_COPY_AND_ASSIGN(PageSnapshotTaker);
 };