Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

chrome/browser/sessions/tab_restore_service_browsertest.cc

 // Copyright (c) 2012 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 "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
 using content::WebContentsTester;
 
 using content::NavigationEntry;
 
@@ skipping 231 matching lines @@
 
 typedef InProcessBrowserTest TabRestoreServiceBrowserTest;
 
 IN_PROC_BROWSER_TEST_F(TabRestoreServiceBrowserTest, RestoreApp) {
   Profile* profile = browser()->profile();
   TabRestoreService* trs = TabRestoreServiceFactory::GetForProfile(profile);
   const char* app_name = "TestApp";
 
   Browser* app_browser = CreateBrowserForApp(app_name, profile);
   app_browser->window()->Close();
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(app_browser));
   observer.Wait();
 
   // One entry should be created.
   ASSERT_EQ(1U, trs->entries().size());
   const TabRestoreService::Entry* restored_entry = trs->entries().front();
 
   // It should be a window with an app.
   ASSERT_EQ(TabRestoreService::WINDOW, restored_entry->type);
@@ skipping 355 matching lines @@
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(contents(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries_.size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries_.size());
 }