summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 19:41:11 +0000
committerdgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 19:41:11 +0000
commit3ad607a6486254ac13e62cf6b05a25153f453e92 (patch)
tree74240b01b463c3201a1ee619abdae86b801820d6
parent404630bee2c9b4feee4176b027115c044512fe19 (diff)
downloadchromium_src-3ad607a6486254ac13e62cf6b05a25153f453e92.zip
chromium_src-3ad607a6486254ac13e62cf6b05a25153f453e92.tar.gz
chromium_src-3ad607a6486254ac13e62cf6b05a25153f453e92.tar.bz2
Reenable DevToolsSanityTest.TestDeviceEmulation on ChromeOS.
BUG=370035 TBR=pfeldman,bokan Review URL: https://codereview.chromium.org/363333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281312 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/devtools/devtools_sanity_browsertest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index b0f22d2..6d5a6fc 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -829,13 +829,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleOnNavigateBack) {
}
-#if defined(OS_CHROMEOS)
-#define MAYBE_TestDeviceEmulation DISABLED_TestDeviceEmulation
-#else
-#define MAYBE_TestDeviceEmulation TestDeviceEmulation
-#endif
-// ChromeOS has --enable-pinch-virtual-viewport on by default: crbug.com/370035.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestDeviceEmulation) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDeviceEmulation) {
RunTest("testDeviceMetricsOverrides", "about:blank");
}