Views: Disable a failing test on the Linux CrOS bot. Fix my mistake in r45662...

chrome/browser/views/tabs/tab_dragging_test.cc

-// 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.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
 
 #if defined(OS_CHROMEOS)
 // Disabled, see http://crbug.com/40043.
 #define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
 #else
 #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
 // Flaky, see http://crbug.com/21092.
 #define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape
 #endif
 
 
 class TabDraggingTest : public UITest {
-protected:
+ protected:
   TabDraggingTest() {
     show_window_ = true;
   }
 };
 
 // Automated UI test to open three tabs in a new window, and drag Tab_1 into
 // the position of Tab_2.
 // Disabled as per http://crbug.com/10941
 TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
@@ skipping 449 matching lines @@
   scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0));
   ASSERT_TRUE(tab1_2.get());
   GURL tab1_2_url;
   ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url));
 
   // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1.
   EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab1_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab3_url.spec());
 }