Move over a bunch of tests from browser_tests to content_browsertests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10831023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148507 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 16 deletions

diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc
index 346d5920..c9b6cb3 100644
--- a/content/browser/device_orientation/device_orientation_browsertest.cc
+++ b/content/browser/device_orientation/device_orientation_browsertest.cc
@@ -5,14 +5,13 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/device_orientation/orientation.h"
 #include "content/browser/device_orientation/provider.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test.h"
+#include "content/test/content_browser_test_utils.h"
 
 namespace device_orientation {
 
@@ -39,17 +38,12 @@ class MockProvider : public Provider {
   virtual ~MockProvider() {}
 };
 
-class DeviceOrientationBrowserTest : public InProcessBrowserTest {
+class DeviceOrientationBrowserTest : public content::ContentBrowserTest {
  public:
-  // From InProcessBrowserTest.
+  // From ContentBrowserTest.
   virtual void SetUpCommandLine(CommandLine* command_line) {
     EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableDeviceOrientation));
   }
-
-  GURL testUrl(const FilePath::CharType* filename) {
-    const FilePath kTestDir(FILE_PATH_LITERAL("device_orientation"));
-    return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
-  }
 };
 
 // crbug.com/113952
@@ -65,14 +59,13 @@ IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) {
   // The test page will register an event handler for orientation events,
   // expects to get an event with kTestOrientation orientation,
   // then removes the event handler and navigates to #pass.
-  GURL test_url = testUrl(FILE_PATH_LITERAL("device_orientation_test.html"));
-  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
-                                                            test_url,
-                                                            2);
+  GURL test_url = content::GetTestUrl(
+      "device_orientation", "device_orientation_test.html");
+  content::NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
 
   // Check that the page got the event it expected and that the provider
   // saw requests for adding and removing an observer.
-  EXPECT_EQ("pass", chrome::GetActiveWebContents(browser())->GetURL().ref());
+  EXPECT_EQ("pass", shell()->web_contents()->GetURL().ref());
   EXPECT_TRUE(provider->added_observer_);
   EXPECT_TRUE(provider->removed_observer_);
 }