summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 04:15:36 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 04:15:36 +0000
commitadd79681956faf86a5b23ba30be4ee754f5fe174 (patch)
tree57d4206b3f3d3f1e6bc45e384d75d7af65e8e51f /chrome/browser/views
parent761fa73ac21b9dc828875fce29ac519f95f73bd9 (diff)
downloadchromium_src-add79681956faf86a5b23ba30be4ee754f5fe174.zip
chromium_src-add79681956faf86a5b23ba30be4ee754f5fe174.tar.gz
chromium_src-add79681956faf86a5b23ba30be4ee754f5fe174.tar.bz2
Views: Disable a failing test on the Linux CrOS bot. Fix my mistake in r45662.
BUG=42514 TEST=CrOS bot goes green. TBR=oshima Review URL: http://codereview.chromium.org/1726010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/tabs/tab_dragging_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 9a0247c..aff4f16 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
@@ -25,7 +25,7 @@
#define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip
#endif
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
// Disabled on Toolkit views bot. See http://crbug.com/42614
#define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape
#else
@@ -35,7 +35,7 @@
class TabDraggingTest : public UITest {
-protected:
+ protected:
TabDraggingTest() {
show_window_ = true;
}