Fix AutomationProvider from logging false errors by replacing the persistent

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 982 matching lines @@
 void DomOperationObserver::Observe(
     NotificationType type, const NotificationSource& source,
     const NotificationDetails& details) {
   if (NotificationType::DOM_OPERATION_RESPONSE == type) {
     Details<DomOperationNotificationDetails> dom_op_details(details);
     OnDomOperationCompleted(dom_op_details->json());
   }
 }
 
 DomOperationMessageSender::DomOperationMessageSender(
-    AutomationProvider* automation)
-    : automation_(automation->AsWeakPtr()) {
+    AutomationProvider* automation,
+    IPC::Message* reply_message,
+    bool use_json_interface)
+    : automation_(automation->AsWeakPtr()),
+      reply_message_(reply_message),
+      use_json_interface_(use_json_interface) {
 }
 
 DomOperationMessageSender::~DomOperationMessageSender() {}
 
 void DomOperationMessageSender::OnDomOperationCompleted(
     const std::string& json) {
-  if (!automation_)
-    return;
-
-  IPC::Message* reply_message = automation_->reply_message_release();
-  if (reply_message) {
-    AutomationMsg_DomOperation::WriteReplyParams(reply_message, json);
-    automation_->Send(reply_message);
-  } else {
-    LOG(ERROR) << "DOM operation completed, but no reply message";
+  if (automation_) {
+    if (use_json_interface_) {
+      DictionaryValue dict;
+      dict.SetString("result", json);
+      AutomationJSONReply(automation_, reply_message_.release())
+          .SendSuccess(&dict);
+    } else {
+      AutomationMsg_DomOperation::WriteReplyParams(reply_message_.get(), json);
+      automation_->Send(reply_message_.release());
+    }
   }
+  delete this;
 }
 
 DocumentPrintedNotificationObserver::DocumentPrintedNotificationObserver(
     AutomationProvider* automation, IPC::Message* reply_message)
     : automation_(automation->AsWeakPtr()),
       success_(false),
       reply_message_(reply_message) {
   registrar_.Add(this, NotificationType::PRINT_JOB_EVENT,
                  NotificationService::AllSources());
 }
@@ skipping 1074 matching lines @@
           this,
           &WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread));
 }
 
 void WaitForProcessLauncherThreadToGoIdleObserver::RunOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (automation_)
     automation_->Send(reply_message_.release());
   Release();
 }
-
-ExecuteJavascriptObserver::ExecuteJavascriptObserver(
-    AutomationProvider* automation,
-    IPC::Message* reply_message)
-    : automation_(automation->AsWeakPtr()),
-      reply_message_(reply_message) {
-}
-
-ExecuteJavascriptObserver::~ExecuteJavascriptObserver() {
-}
-
-void ExecuteJavascriptObserver::OnDomOperationCompleted(
-    const std::string& json) {
-  if (automation_) {
-    DictionaryValue dict;
-    dict.SetString("result", json);
-    AutomationJSONReply(automation_, reply_message_.release())
-        .SendSuccess(&dict);
-  }
-  delete this;
-}