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

chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/test_utils.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/accelerators/accelerator_cocoa.h"
 
 using content::SiteInstance;
 using content::WebContents;
 
 @interface FullscreenExitBubbleController(JustForTesting)
 // Already defined.
 + (NSString*)keyCommandString;
@@ skipping 52 matching lines @@
   NSWindow* window = browser()->window()->GetNativeWindow();
   BrowserWindowController* bwc = [BrowserWindowController
       browserWindowControllerForWindow:window];
 
   [bwc showWindow:nil];
 
   AppendTabToStrip();
   WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser());
   {
     base::mac::ScopedNSAutoreleasePool pool;
-    ui_test_utils::WindowedNotificationObserver fullscreen_observer(
+    content::WindowedNotificationObserver fullscreen_observer(
         chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         content::NotificationService::AllSources());
     browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
     fullscreen_observer.Wait();
     ASSERT_TRUE(browser()->window()->IsFullscreen());
   }
 
   FullscreenExitBubbleController* bubble = [bwc fullscreenExitBubbleController];
   EXPECT_TRUE(bubble);
   {
-    ui_test_utils::WindowedNotificationObserver fullscreen_observer(
+    content::WindowedNotificationObserver fullscreen_observer(
         chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         content::NotificationService::AllSources());
     [bubble deny:nil];
     fullscreen_observer.Wait();
   }
   EXPECT_FALSE([bwc fullscreenExitBubbleController]);
   EXPECT_FALSE(browser()->window()->IsFullscreen());
   CloseBrowserWindow();
 }
 
 TEST_F(FullscreenExitBubbleControllerTest, LabelWasReplaced) {
   EXPECT_FALSE([controller_ exitLabelPlaceholder]);
   EXPECT_TRUE([controller_ exitLabel]);
 }
 
 TEST_F(FullscreenExitBubbleControllerTest, ShortcutText) {
   ui::AcceleratorCocoa cmd_F(@"F", NSCommandKeyMask);
   ui::AcceleratorCocoa cmd_shift_f(@"f", NSCommandKeyMask|NSShiftKeyMask);
   NSString* cmd_F_text = [FullscreenExitBubbleController
       keyCombinationForAccelerator:cmd_F];
   NSString* cmd_shift_f_text = [FullscreenExitBubbleController
       keyCombinationForAccelerator:cmd_shift_f];
   EXPECT_NSEQ(cmd_shift_f_text, cmd_F_text);
   EXPECT_NSEQ(@"\u2318\u21E7F", cmd_shift_f_text);
 }