| 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 "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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 GURL tab3_new_url; | 339 GURL tab3_new_url; |
| 340 ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url)); | 340 ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url)); |
| 341 | 341 |
| 342 // The tabs should be in their original positions. | 342 // The tabs should be in their original positions. |
| 343 EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec()); | 343 EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec()); |
| 344 EXPECT_EQ(tab2_new_url.spec(), tab2_url.spec()); | 344 EXPECT_EQ(tab2_new_url.spec(), tab2_url.spec()); |
| 345 EXPECT_EQ(tab3_new_url.spec(), tab3_url.spec()); | 345 EXPECT_EQ(tab3_new_url.spec(), tab3_url.spec()); |
| 346 } | 346 } |
| 347 | 347 |
| 348 // Drag Tab_2 out of the Tab strip. A new window should open with this tab. | 348 // Drag Tab_2 out of the Tab strip. A new window should open with this tab. |
| 349 TEST_F(TabDraggingTest, DISABLED_Tab2OutOfTabStrip) { | 349 TEST_F(TabDraggingTest, Tab2OutOfTabStrip) { |
| 350 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 350 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 351 ASSERT_TRUE(browser.get()); | 351 ASSERT_TRUE(browser.get()); |
| 352 scoped_refptr<WindowProxy> window(browser->GetWindow()); | 352 scoped_refptr<WindowProxy> window(browser->GetWindow()); |
| 353 ASSERT_TRUE(window.get()); | 353 ASSERT_TRUE(window.get()); |
| 354 | 354 |
| 355 // Get initial tab count. | 355 // Get initial tab count. |
| 356 int initial_tab_count = 0; | 356 int initial_tab_count = 0; |
| 357 ASSERT_TRUE(browser->GetTabCount(&initial_tab_count)); | 357 ASSERT_TRUE(browser->GetTabCount(&initial_tab_count)); |
| 358 ASSERT_TRUE(1 == initial_tab_count); | 358 ASSERT_TRUE(1 == initial_tab_count); |
| 359 | 359 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); | 481 scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0)); |
| 482 ASSERT_TRUE(tab1_2.get()); | 482 ASSERT_TRUE(tab1_2.get()); |
| 483 GURL tab1_2_url; | 483 GURL tab1_2_url; |
| 484 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); | 484 ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url)); |
| 485 | 485 |
| 486 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. | 486 // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1. |
| 487 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); | 487 EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec()); |
| 488 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); | 488 EXPECT_NE(tab1_2_url.spec(), tab1_url.spec()); |
| 489 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); | 489 EXPECT_NE(tab1_2_url.spec(), tab3_url.spec()); |
| 490 } | 490 } |
| OLD | NEW |