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

chrome/browser/infobars/infobars_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 "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
@@ skipping 17 matching lines @@
     command_line->AppendSwitchASCII(
         switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
   }
 
   void InstallExtension(const char* filename) {
     FilePath path = ui_test_utils::GetTestFilePath(
         FilePath().AppendASCII("extensions"), FilePath().AppendASCII(filename));
     Profile* profile = browser()->profile();
     ExtensionService* service = profile->GetExtensionService();
 
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_EXTENSION_LOADED,
         content::NotificationService::AllSources());
 
     ExtensionInstallPrompt* client =
         chrome::CreateExtensionInstallPromptWithBrowser(browser());
     scoped_refptr<CrxInstaller> installer(
         CrxInstaller::Create(service, client));
     installer->set_install_cause(extension_misc::INSTALL_CAUSE_AUTOMATION);
     installer->InstallCrx(path);
 
     observer.Wait();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   ASSERT_TRUE(test_server()->Start());
 
   ui_test_utils::NavigateToURL(
       browser(), test_server()->GetURL("files/simple.html"));
 
-  ui_test_utils::WindowedNotificationObserver infobar_added_1(
+  content::WindowedNotificationObserver infobar_added_1(
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
         content::NotificationService::AllSources());
   InstallExtension("theme.crx");
   infobar_added_1.Wait();
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), test_server()->GetURL("files/simple.html"),
       NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  ui_test_utils::WindowedNotificationObserver infobar_added_2(
+  content::WindowedNotificationObserver infobar_added_2(
         chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
         content::NotificationService::AllSources());
-  ui_test_utils::WindowedNotificationObserver infobar_removed_1(
+  content::WindowedNotificationObserver infobar_removed_1(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
         content::NotificationService::AllSources());
   InstallExtension("theme2.crx");
   infobar_added_2.Wait();
   infobar_removed_1.Wait();
   EXPECT_EQ(0u,
             chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()->
                 infobar_count());
 
-  ui_test_utils::WindowedNotificationObserver infobar_removed_2(
+  content::WindowedNotificationObserver infobar_removed_2(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
         content::NotificationService::AllSources());
   ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();
   infobar_removed_2.Wait();
   EXPECT_EQ(0u,
             chrome::GetActiveTabContents(browser())->infobar_tab_helper()->
                 infobar_count());
 }