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

chrome/browser/automation/testing_automation_provider.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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 6173 matching lines @@
     return;
   }
   DictionaryValue dict;
   dict.SetString("title", tab_contents->GetTitle());
   reply.SendSuccess(&dict);
 }
 
 void TestingAutomationProvider::CaptureEntirePageJSON(
     DictionaryValue* args,
     IPC::Message* reply_message) {
+#if defined(OS_LINUX)
+  // See crbug.com/89777.
+  AutomationJSONReply(this, reply_message).SendError(
+      "Taking a page snapshot is not supported on this platform");
+  return;
+#endif
   if (SendErrorIfModalDialogActive(this, reply_message))
     return;
 
   TabContents* tab_contents;
   std::string error;
 
   if (!GetTabFromJSONArgs(args, &tab_contents, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
 
   FilePath::StringType path_str;
   if (!args->GetString("path", &path_str)) {
     AutomationJSONReply(this, reply_message)
         .SendError("'path' missing or invalid");
     return;
   }
 
   RenderViewHost* render_view = tab_contents->render_view_host();
   if (render_view) {
     FilePath path(path_str);
     // This will delete itself when finished.
     PageSnapshotTaker* snapshot_taker = new PageSnapshotTaker(
-        this, reply_message,
-        TabContentsWrapper::GetCurrentWrapperForContents(tab_contents), path);
+        this, reply_message, render_view, path);
     snapshot_taker->Start();
   } else {
     AutomationJSONReply(this, reply_message)
         .SendError("Tab has no associated RenderViewHost");
   }
 }
 
 void TestingAutomationProvider::GetCookiesJSON(
     DictionaryValue* args, IPC::Message* reply_message) {
   automation_util::GetCookiesJSON(this, args, reply_message);
@@ skipping 299 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }