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

chrome/browser/automation/automation_tab_helper.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/automation/automation_tab_helper.h"
 
 #include <algorithm>
 
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "chrome/common/automation_messages.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
-#include "ui/gfx/size.h"
-
 TabEventObserver::TabEventObserver() { }
 
 TabEventObserver::~TabEventObserver() {
   for (size_t i = 0; i < event_sources_.size(); ++i) {
     if (event_sources_[i])
       event_sources_[i]->RemoveObserver(this);
   }
 }
 
 void TabEventObserver::StartObserving(AutomationTabHelper* tab_helper) {
@@ skipping 17 matching lines @@
 AutomationTabHelper::~AutomationTabHelper() { }
 
 void AutomationTabHelper::AddObserver(TabEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AutomationTabHelper::RemoveObserver(TabEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void AutomationTabHelper::SnapshotEntirePage() {
-  Send(new AutomationMsg_SnapshotEntirePage(routing_id()));
-}
-
 bool AutomationTabHelper::has_pending_loads() const {
   return is_loading_ || !pending_client_redirects_.empty();
 }
 
 void AutomationTabHelper::DidStartLoading() {
   if (is_loading_) {
     // DidStartLoading is often called twice. Once when the renderer sends a
     // load start message, and once when the browser calls it directly as a
     // result of some user-initiated navigation.
     VLOG(1) << "Received DidStartLoading while loading already started.";
@@ skipping 30 matching lines @@
 void AutomationTabHelper::OnTabOrRenderViewDestroyed(
     TabContents* tab_contents) {
   if (has_pending_loads()) {
     is_loading_ = false;
     pending_client_redirects_.clear();
     FOR_EACH_OBSERVER(TabEventObserver, observers_,
                       OnNoMorePendingLoads(tab_contents));
   }
 }
 
-void AutomationTabHelper::OnSnapshotEntirePageACK(
-    bool success,
-    const std::vector<unsigned char>& png_data,
-    const std::string& error_msg) {
-  FOR_EACH_OBSERVER(TabEventObserver, observers_,
-                    OnSnapshotEntirePageACK(success, png_data, error_msg));
-}
-
 bool AutomationTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   bool msg_is_good = true;
   IPC_BEGIN_MESSAGE_MAP_EX(AutomationTabHelper, message, msg_is_good)
-    IPC_MESSAGE_HANDLER(AutomationMsg_SnapshotEntirePageACK,
-                        OnSnapshotEntirePageACK)
     IPC_MESSAGE_HANDLER(AutomationMsg_WillPerformClientRedirect,
                         OnWillPerformClientRedirect)
     IPC_MESSAGE_HANDLER(AutomationMsg_DidCompleteOrCancelClientRedirect,
                         OnDidCompleteOrCancelClientRedirect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   if (!msg_is_good) {
     LOG(ERROR) << "Failed to deserialize an IPC message";
   }
   return handled;
@@ skipping 23 matching lines @@
   // It is possible that we did not track the redirect becasue it had a non-zero
   // delay. See the comment in |OnWillPerformClientRedirect|.
   if (iter != pending_client_redirects_.end()) {
     pending_client_redirects_.erase(iter);
     if (!has_pending_loads()) {
       FOR_EACH_OBSERVER(TabEventObserver, observers_,
                         OnNoMorePendingLoads(tab_contents()));
     }
   }
 }