Add abstractions that let embedders drive tests of WebContents.

chrome/browser/ui/panels/base_panel_browser_test.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/ui/panels/base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/string_ordinal.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/test/web_contents_tester.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 
+#if defined(OS_LINUX)
+#include "ui/base/x/x11_util.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #endif
 
+using content::WebContentsTester;
+
 namespace {
 
 const int kTestingWorkAreaWidth = 800;
 const int kTestingWorkAreaHeight = 600;
 
 struct MockDesktopBar {
   bool auto_hiding_enabled;
   DisplaySettingsProvider::DesktopBarVisibility visibility;
   int thickness;
 };
@@ skipping 378 matching lines @@
   // SHOW_AS_ACTIVE.
   CreatePanelParams params(name, bounds, SHOW_AS_ACTIVE);
   params.expected_active_state = SHOW_AS_INACTIVE;
   Panel* panel = CreatePanelWithParams(params);
   WaitForLayoutModeChanged(panel, PanelStrip::IN_OVERFLOW);
   return panel;
 }
 
 void BasePanelBrowserTest::CreateTestTabContents(Browser* browser) {
   TabContentsWrapper* tab_contents =
-      new TabContentsWrapper(new TestTabContents(browser->profile(), NULL));
+      new TabContentsWrapper(
+          WebContentsTester::CreateTestWebContents(browser->profile(), NULL));
   browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK);
 }
 
 scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
     const FilePath::StringType& path,
     Extension::Location location,
     const DictionaryValue& extra_value) {
 #if defined(OS_WIN)
   FilePath full_path(FILE_PATH_LITERAL("c:\\"));
 #else
@@ skipping 39 matching lines @@
 }
 
 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string BasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }