Enable device orientation by default.

Enable device orientation by default. Replace the --enable-device-orientation
command-line flag with a --disable-device-orientation flag.

BUG=44654
TEST=browser_tests --gtest_filter="DeviceOrientationBrowserTest.*"

Review URL: http://codereview.chromium.org/3136038

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

2 files changed, 1 insertions, 35 deletions

diff --git a/chrome/browser/device_orientation/device_orientation_browsertest.cc b/chrome/browser/device_orientation/device_orientation_browsertest.cc
index 332316e..d33f5d3 100644
--- a/chrome/browser/device_orientation/device_orientation_browsertest.cc
+++ b/chrome/browser/device_orientation/device_orientation_browsertest.cc
@@ -38,7 +38,7 @@ class DeviceOrientationBrowserTest : public InProcessBrowserTest {
  public:
   // From InProcessBrowserTest.
   virtual void SetUpCommandLine(CommandLine* command_line) {
-    command_line->AppendSwitch(switches::kEnableDeviceOrientation);
+    EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableDeviceOrientation));
   }
 
   GURL testUrl(const FilePath::CharType* filename) {
diff --git a/chrome/browser/device_orientation/enable_switch_browsertest.cc b/chrome/browser/device_orientation/enable_switch_browsertest.cc
deleted file mode 100644
index ee3303c..0000000
--- a/chrome/browser/device_orientation/enable_switch_browsertest.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2010 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 "base/command_line.h"
-#include "base/file_path.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-
-class DeviceOrientationEnableSwitchTest : public InProcessBrowserTest {
- public:
-  GURL testUrl(const FilePath::CharType* filename) {
-    const FilePath kTestDir(FILE_PATH_LITERAL("device_orientation"));
-    return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(DeviceOrientationEnableSwitchTest, UnavailabilityTest) {
-  // Test that device orientation is not available to a web page if
-  // the runtime switch is disabled.
-
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  bool has_switch = command_line.HasSwitch(switches::kEnableDeviceOrientation);
-  ASSERT_FALSE(has_switch) << "This test does not make sense if "
-                           << "--enable-device-orientation is set.";
-
-  GURL test_url = testUrl(FILE_PATH_LITERAL("enable_switch_test.html"));
-  ui_test_utils::NavigateToURL(browser(), test_url);
-  std::string status = browser()->GetSelectedTabContents()->GetURL().ref();
-  EXPECT_EQ("pass", status) << "Page detected device orientation properties.";
-}