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

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include "base/mac/mac_util.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/test/test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @interface BrowserWindowController (JustForTesting)
 // Already defined in BWC.
 - (void)saveWindowPositionIfNeeded;
 - (void)layoutSubviews;
 @end
 
 @interface BrowserWindowController (ExposedForTesting)
@@ skipping 629 matching lines @@
 
 // Check if the window is front most or if one of its child windows (such
 // as a status bubble) is front most.
 static bool IsFrontWindow(NSWindow *window) {
   NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
   return [frontmostWindow isEqual:window] ||
          [[frontmostWindow parentWindow] isEqual:window];
 }
 
 void WaitForFullScreenTransition() {
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_FULLSCREEN_CHANGED,
       content::NotificationService::AllSources());
   observer.Wait();
 }
 
 TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
   CreateBrowserWindow();
   [controller_ showWindow:nil];
   EXPECT_FALSE([controller_ isFullscreen]);
 
@@ skipping 47 matching lines @@
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */