Revert "Refactor automation messages." due to mysterious problems on mac.

chrome/browser/automation/extension_port_container.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/extension_port_container.h"
 
 #include "base/logging.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/common/automation_messages.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/test/automation/automation_messages.h"
 
 // TODO(siggi): Find a more structured way to read and write JSON messages.
 
 namespace ext = extension_automation_constants;
 
 ExtensionPortContainer::ExtensionPortContainer(AutomationProvider* automation,
                                                int tab_handle) :
     automation_(automation), service_(NULL), port_id_(-1),
     tab_handle_(tab_handle) {
   service_ = automation_->profile()->GetExtensionMessageService();
@@ skipping 221 matching lines @@
       // This will delete the port and notify the other end of the disconnect.
       automation->RemovePortContainer(port);
     }
   } else {
     // We don't expect other messages here.
     NOTREACHED();
   }
 
   return true;
 }