Bugfix: some circumstances caused an automation reply DCHECK to fail in debug builds.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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 6910 matching lines @@
   }
   DictionaryValue dict;
   dict.SetBoolean(
       "does_exist",
       automation_util::DoesObjectWithIdExist(id, profile()));
   reply.SendSuccess(&dict);
 }
 
 void TestingAutomationProvider::CloseTabJSON(
     DictionaryValue* args, IPC::Message* reply_message) {
-  AutomationJSONReply reply(this, reply_message);
   Browser* browser;
   WebContents* tab;
   std::string error;
   bool wait_until_closed = false;  // ChromeDriver does not use this.
   args->GetBoolean("wait_until_closed", &wait_until_closed);
   // Close tabs synchronously.
   if (GetBrowserAndTabFromJSONArgs(args, &browser, &tab, &error)) {
     if (wait_until_closed) {
       new TabClosedNotificationObserver(this, wait_until_closed, reply_message,
                                         true);
     }
     chrome::CloseWebContents(browser, tab);
     if (!wait_until_closed)
-      reply.SendSuccess(NULL);
+      AutomationJSONReply(this, reply_message).SendSuccess(NULL);
     return;
   }
   // Close other types of views asynchronously.
   RenderViewHost* view;
   if (!GetRenderViewFromJSONArgs(args, profile(), &view, &error)) {
-    reply.SendError(error);
+    AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
   view->ClosePage();
-  reply.SendSuccess(NULL);
+  AutomationJSONReply(this, reply_message).SendSuccess(NULL);
 }
 
 void TestingAutomationProvider::SetViewBounds(
     base::DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   int x, y, width, height;
   if (!args->GetInteger("bounds.x", &x) ||
       !args->GetInteger("bounds.y", &y) ||
       !args->GetInteger("bounds.width", &width) ||
@@ skipping 199 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }