Part 2 of reapplying r64637.

chrome/browser/automation/automation_provider_json.cc

 // Copyright (c) 2010 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_json.h"
 
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/automation/automation_provider.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
 
 namespace {
 
 // Util for creating a JSON error return string (dict with key
 // 'error' and error string value).  No need to quote input.
 std::string JSONErrorString(const std::string& err) {
   std::string prefix = "{\"error\": \"";
   std::string no_quote_err;
   std::string suffix = "\"}";
 
@@ skipping 25 matching lines @@
 }
 
 void AutomationJSONReply::SendError(const std::string& error_message) {
   DCHECK(message_) << "Resending reply for JSON automation request";
   std::string json_string = JSONErrorString(error_message);
   AutomationMsg_SendJSONRequest::WriteReplyParams(
       message_, json_string, false);
   provider_->Send(message_);
   message_ = NULL;
 }