| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
| 8 #include "chrome/browser/view_ids.h" | 8 #include "chrome/browser/view_ids.h" |
| 9 #include "chrome/common/chrome_paths.h" | 9 #include "chrome/common/chrome_paths.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 // Disabled on Toolkit views bot. See http://crbug.com/42614 | 30 // Disabled on Toolkit views bot. See http://crbug.com/42614 |
| 31 #define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape | 31 #define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape |
| 32 #else | 32 #else |
| 33 // Flaky, see http://crbug.com/21092. | 33 // Flaky, see http://crbug.com/21092. |
| 34 #define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape | 34 #define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 // These tests fail on Linux because we haven't implemented all of tab dragging | 37 // These tests fail on Linux because we haven't implemented all of tab dragging |
| 38 // (it's not needed on chromeos). See http://crbug.com/10941 | 38 // (it's not needed on chromeos). See http://crbug.com/10941 |
| 39 #if defined(OS_LINUX) | 39 #if defined(OS_LINUX) |
| 40 #define DISABLED_Tab1Tab2 FAILS_Tab1Tab2 | 40 #define MAYBE_Tab1Tab2 DISABLED_Tab1Tab2 |
| 41 #define DISABLED_Tab1Tab3 FAILS_Tab1Tab3 | 41 #define MAYBE_Tab1Tab3 DISABLED_Tab1Tab3 |
| 42 #else | 42 #else |
| 43 #define MAYBE_Tab1Tab2 Tab1Tab2 | 43 #define MAYBE_Tab1Tab2 Tab1Tab2 |
| 44 #define MAYBE_Tab1Tab3 Tab1Tab3 | 44 #define MAYBE_Tab1Tab3 Tab1Tab3 |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 class TabDraggingTest : public UITest { | 47 class TabDraggingTest : public UITest { |
| 48 protected: | 48 protected: |
| 49 TabDraggingTest() { | 49 TabDraggingTest() { |
| 50 show_window_ = true; | 50 show_window_ = true; |
| 51 } | 51 } |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); | 506 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); |
| 507 ASSERT_TRUE(tab1_2.get()); | 507 ASSERT_TRUE(tab1_2.get()); |
| 508 GURL tab1_2_url; | 508 GURL tab1_2_url; |
| 509 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); | 509 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); |
| 510 | 510 |
| 511 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. | 511 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. |
| 512 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); | 512 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); |
| 513 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); | 513 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); |
| 514 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); | 514 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); |
| 515 } | 515 } |
| OLD | NEW |