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

chrome/browser/extensions/app_background_page_apitest.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/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_notification_tracker.h"
+#include "content/public/test/test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
 using extensions::Extension;
 
 class AppBackgroundPageApiTest : public ExtensionApiTest {
  public:
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
     command_line->AppendSwitch(switches::kAllowHTTPBackgroundPage);
@@ skipping 30 matching lines @@
     // this check.
     if (!manager || !manager->IsBackgroundModePrefEnabled()) {
       DLOG(WARNING) << "Skipping check - background mode disabled";
       return true;
     }
     if (manager->IsBackgroundModeActiveForTest() == expected_background_mode)
       return true;
 
     // We are not currently in the expected state - wait for the state to
     // change.
-    ui_test_utils::WindowedNotificationObserver watcher(
+    content::WindowedNotificationObserver watcher(
         chrome::NOTIFICATION_BACKGROUND_MODE_CHANGED,
         content::NotificationService::AllSources());
     watcher.Wait();
     return manager->IsBackgroundModeActiveForTest() == expected_background_mode;
 #endif
   }
 
  private:
   ScopedTempDir app_dir_;
 };
@@ skipping 323 matching lines @@
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
   // Now close the BackgroundContents.
   ASSERT_TRUE(RunExtensionTest("app_background_page/basic_close")) << message_;
   // Background mode should no longer be active.
   ASSERT_TRUE(WaitForBackgroundMode(false));
   ASSERT_FALSE(
       BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
           GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
 }