Part 2 of reapplying r64637.

chrome_frame/external_tab_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 "chrome_frame/external_tab.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/tracked.h"
 
 // #include "base/waitable_event.h"
 
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
 
 
 // DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
 // DISABLE_RUNNABLE_METHOD_REFCOUNT(UIDelegate);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ChromeProxyDelegate);
@@ skipping 213 matching lines @@
   tab_params.is_widget_mode = false;
   tab_params.url = initial_url;
 
   tab->CreateTab(tab_params, &ui_delegate);
   tab->Navigate("http://asgard.org", EmptyString(), true);
 
   loop.RunFor(5);
   EXPECT_FALSE(loop.WasTimedOut());
   tab.reset();
 }