| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/gfx/rect.h" | 7 #include "base/gfx/rect.h" |
| 8 #include "chrome/app/chrome_dll_resource.h" | 8 #include "chrome/app/chrome_dll_resource.h" |
| 9 #include "chrome/browser/view_ids.h" | 9 #include "chrome/browser/view_ids.h" |
| 10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url)); | 227 ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url)); |
| 228 | 228 |
| 229 EXPECT_EQ(tab1_new_url.spec(), tab2_url.spec()); | 229 EXPECT_EQ(tab1_new_url.spec(), tab2_url.spec()); |
| 230 EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec()); | 230 EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec()); |
| 231 EXPECT_EQ(tab3_new_url.spec(), tab1_url.spec()); | 231 EXPECT_EQ(tab3_new_url.spec(), tab1_url.spec()); |
| 232 } | 232 } |
| 233 | 233 |
| 234 // Drag Tab_1 into the position of Tab_3, and press ESCAPE before releasing the | 234 // Drag Tab_1 into the position of Tab_3, and press ESCAPE before releasing the |
| 235 // left mouse button. | 235 // left mouse button. |
| 236 // Flaky, see http://crbug.com/21092. | 236 // Flaky, see http://crbug.com/21092. |
| 237 TEST_F(TabDraggingTest, DISABLED_Tab1Tab3Escape) { | 237 TEST_F(TabDraggingTest, FLAKY_Tab1Tab3Escape) { |
| 238 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 238 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 239 ASSERT_TRUE(browser.get()); | 239 ASSERT_TRUE(browser.get()); |
| 240 scoped_refptr<WindowProxy> window(browser->GetWindow()); | 240 scoped_refptr<WindowProxy> window(browser->GetWindow()); |
| 241 ASSERT_TRUE(window.get()); | 241 ASSERT_TRUE(window.get()); |
| 242 | 242 |
| 243 // Get initial tab count. | 243 // Get initial tab count. |
| 244 int initial_tab_count = 0; | 244 int initial_tab_count = 0; |
| 245 ASSERT_TRUE(browser->GetTabCount(&initial_tab_count)); | 245 ASSERT_TRUE(browser->GetTabCount(&initial_tab_count)); |
| 246 ASSERT_TRUE(1 == initial_tab_count); | 246 ASSERT_TRUE(1 == initial_tab_count); |
| 247 | 247 |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); | 476 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); |
| 477 ASSERT_TRUE(tab1_2.get()); | 477 ASSERT_TRUE(tab1_2.get()); |
| 478 GURL tab1_2_url; | 478 GURL tab1_2_url; |
| 479 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); | 479 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); |
| 480 | 480 |
| 481 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. | 481 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. |
| 482 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); | 482 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); |
| 483 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); | 483 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); |
| 484 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); | 484 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); |
| 485 } | 485 } |
| OLD | NEW |