Part 2 of reapplying r64637.

chrome_frame/cfproxy_test.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 <string>
 #include "base/file_path.h"
 #include "base/waitable_event.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome_frame/cfproxy_private.h"
-#include "chrome/test/automation/automation_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::NotNull;
 using testing::Return;
 using testing::StrictMock;
 using testing::InvokeWithoutArgs;
@@ skipping 516 matching lines @@
 
   // Tuple3<int, GURL, int>
   AutomationMsg_GetCookiesFromHost m18(0, 1, url, 903);
   EXPECT_CALL(delegate, GetCookies(url, 903));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m18));
 
   AutomationMsg_CloseExternalTab m19(0, 1);
   EXPECT_CALL(delegate, TabClosed());
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m19));
 }