Send screenshots back to the client for debugging

chrome/browser/automation/automation_provider_observers.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_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 1650 matching lines @@
     }
     delete this;
   } else {
     NOTREACHED();
   }
 }
 
 PageSnapshotTaker::PageSnapshotTaker(AutomationProvider* automation,
                                      IPC::Message* reply_message,
                                      RenderViewHost* render_view,
-                                     const FilePath& path)
+                                     const FilePath& path,
+                                     bool use_json_interface)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       render_view_(render_view),
       image_path_(path),
-      received_width_(false) {}
+      received_width_(false),
+      use_json_interface_(use_json_interface) {}
 
 PageSnapshotTaker::~PageSnapshotTaker() {}
 
 void PageSnapshotTaker::Start() {
   ExecuteScript(L"window.domAutomationController.send(document.width);");
 }
 
 void PageSnapshotTaker::OnDomOperationCompleted(const std::string& json) {
   int dimension;
   if (!base::StringToInt(json, &dimension)) {
@@ skipping 38 matching lines @@
       reply_message_->routing_id());
 
   render_view_->ExecuteJavascriptInWebFrame(string16(),
                                             WideToUTF16Hack(set_automation_id));
   render_view_->ExecuteJavascriptInWebFrame(string16(),
                                             WideToUTF16Hack(javascript));
 }
 
 void PageSnapshotTaker::SendMessage(bool success) {
   if (automation_) {
-    AutomationMsg_CaptureEntirePageAsPNG::WriteReplyParams(reply_message_.get(),
-                                                           success);
-    automation_->Send(reply_message_.release());
+    if (use_json_interface_) {
+      DictionaryValue dict;
+      dict.SetBoolean("result", success);

[kkania, 2011/03/17 18:35:11]

change this to "success" to match what you have in automation_json_requests.cc

[Joe, 2011/03/18 00:33:32]

Done.

+      AutomationJSONReply(automation_, reply_message_.release())
+          .SendSuccess(&dict);
+    } else {
+      AutomationMsg_CaptureEntirePageAsPNG::WriteReplyParams(
+          reply_message_.get(), success);
+      automation_->Send(reply_message_.release());
+    }
   }
   delete this;
 }
 
 NTPInfoObserver::NTPInfoObserver(
     AutomationProvider* automation,
     IPC::Message* reply_message,
     CancelableRequestConsumer* consumer)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
@@ skipping 392 matching lines @@
           this,
           &WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread));
 }
 
 void WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (automation_)
     automation_->Send(reply_message_.release());
   Release();
 }