Part 2 of reapplying r64637.

chrome_frame/test/net/test_automation_provider.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_frame/test/net/test_automation_provider.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
 
 namespace {
 
 // A special command line switch to just run the unit tests without CF in
 // the picture.  Can be useful when the harness itself needs to be debugged.
 const wchar_t kNoCfTestRun[] = L"no-cf-test-run";
 
 bool CFTestsDisabled() {
   static bool switch_present = CommandLine::ForCurrentProcess()->
@@ skipping 95 matching lines @@
 
 // static
 TestAutomationProvider* TestAutomationProvider::NewAutomationProvider(
     Profile* p, const std::string& channel,
     TestAutomationProviderDelegate* delegate) {
   TestAutomationProvider* automation = new TestAutomationProvider(p, delegate);
   automation->ConnectToChannel(channel);
   automation->SetExpectedTabCount(1);
   return automation;
 }