Make automation proxy objects to ref_counted. That allows to process async no...

chrome/browser/views/tabs/tab_dragging_test.cc

 // Copyright (c) 2006-2008 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"
@@ skipping 11 matching lines @@
 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_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  scoped_ptr<WindowProxy> window(browser->GetWindow());
+  scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
   // Get Tab_1 which comes with the browser window.
-  scoped_ptr<TabProxy> tab1(browser->GetTab(0));
+  scoped_refptr<TabProxy> tab1(browser->GetTab(0));
   ASSERT_TRUE(tab1.get());
   GURL tab1_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_url));
 
   // Add Tab_2.
   GURL tab2_url("about:");
   ASSERT_TRUE(browser->AppendTab(tab2_url));
-  scoped_ptr<TabProxy> tab2(browser->GetTab(1));
+  scoped_refptr<TabProxy> tab2(browser->GetTab(1));
   ASSERT_TRUE(tab2.get());
 
   // Add Tab_3.
   GURL tab3_url("about:plugins");
   ASSERT_TRUE(browser->AppendTab(tab3_url));
-  scoped_ptr<TabProxy> tab3(browser->GetTab(2));
+  scoped_refptr<TabProxy> tab3(browser->GetTab(2));
   ASSERT_TRUE(tab3.get());
 
   // Make sure 3 tabs are open.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(initial_tab_count + 2,
                                                10000));
 
   // Get bounds for the tabs.
   gfx::Rect bounds1;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_0, &bounds1, false));
   EXPECT_LT(0, bounds1.x());
@@ skipping 38 matching lines @@
   POINT end;
   start.x = bounds1.x() + bounds1.width()/2;
   start.y = bounds1.y() + bounds1.height()/2;
   end.x = start.x + 2*bounds1.width()/3;
   end.y = start.y;
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now check for expected results.
-  tab1.reset(browser->GetTab(0));
+  tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
-  tab2.reset(browser->GetTab(1));
+  tab2 = browser->GetTab(1);
   ASSERT_TRUE(tab2.get());
   GURL tab2_new_url;
   ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
   EXPECT_EQ(tab1_url.spec(), tab2_new_url.spec());
   EXPECT_EQ(tab2_url.spec(), tab1_new_url.spec());
 }
 
 // Drag Tab_1 into the position of Tab_3.
 // Disabled as per http://crbug.com/10941
 TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
-  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  scoped_ptr<WindowProxy> window(browser->GetWindow());
+  scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
   // Get Tab_1 which comes with the browser window.
-  scoped_ptr<TabProxy> tab1(browser->GetTab(0));
+  scoped_refptr<TabProxy> tab1(browser->GetTab(0));
   ASSERT_TRUE(tab1.get());
   GURL tab1_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_url));
 
   // Add Tab_2.
   GURL tab2_url("about:");
   ASSERT_TRUE(browser->AppendTab(tab2_url));
-  scoped_ptr<TabProxy> tab2(browser->GetTab(1));
+  scoped_refptr<TabProxy> tab2(browser->GetTab(1));
   ASSERT_TRUE(tab2.get());
 
   // Add Tab_3.
   GURL tab3_url("about:plugins");
   ASSERT_TRUE(browser->AppendTab(tab3_url));
-  scoped_ptr<TabProxy> tab3(browser->GetTab(2));
+  scoped_refptr<TabProxy> tab3(browser->GetTab(2));
   ASSERT_TRUE(tab3.get());
 
   // Make sure 3 tabs are open.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(initial_tab_count + 2,
                                                10000));
 
   // Get bounds for the tabs.
   gfx::Rect bounds1;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_0, &bounds1, false));
   EXPECT_LT(0, bounds1.x());
@@ skipping 38 matching lines @@
   POINT end;
   start.x = bounds1.x() + bounds1.width()/2;
   start.y = bounds1.y() + bounds1.height()/2;
   end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2;
   end.y = start.y;
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now check for expected results.
-  tab1.reset(browser->GetTab(0));
+  tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
-  tab2.reset(browser->GetTab(1));
+  tab2 = browser->GetTab(1);
   ASSERT_TRUE(tab2.get());
   GURL tab2_new_url;
   ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
-  tab3.reset(browser->GetTab(2));
+  tab3 = browser->GetTab(2);
   ASSERT_TRUE(tab3.get());
   GURL tab3_new_url;
   ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url));
 
   EXPECT_EQ(tab1_new_url.spec(), tab2_url.spec());
   EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec());
   EXPECT_EQ(tab3_new_url.spec(), tab1_url.spec());
 }
 
 // Drag Tab_1 into the position of Tab_3, and press ESCAPE before releasing the
 // left mouse button.
 TEST_F(TabDraggingTest, Tab1Tab3Escape) {
-  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  scoped_ptr<WindowProxy> window(browser->GetWindow());
+  scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
   // Get Tab_1 which comes with the browser window.
-  scoped_ptr<TabProxy> tab1(browser->GetTab(0));
+  scoped_refptr<TabProxy> tab1(browser->GetTab(0));
   ASSERT_TRUE(tab1.get());
   GURL tab1_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_url));
 
   // Add Tab_2.
   GURL tab2_url("about:");
   ASSERT_TRUE(browser->AppendTab(tab2_url));
-  scoped_ptr<TabProxy> tab2(browser->GetTab(1));
+  scoped_refptr<TabProxy> tab2(browser->GetTab(1));
   ASSERT_TRUE(tab2.get());
 
   // Add Tab_3.
   GURL tab3_url("about:plugins");
   ASSERT_TRUE(browser->AppendTab(tab3_url));
-  scoped_ptr<TabProxy> tab3(browser->GetTab(2));
+  scoped_refptr<TabProxy> tab3(browser->GetTab(2));
   ASSERT_TRUE(tab3.get());
 
   // Make sure 3 tabs are open.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(initial_tab_count + 2,
                                                10000));
 
   // Get bounds for the tabs.
   gfx::Rect bounds1;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_0, &bounds1, false));
   EXPECT_LT(0, bounds1.x());
@@ skipping 41 matching lines @@
   end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2;
   end.y = start.y;
 
   // Simulate drag with 'true' as the last parameter. This will interrupt
   // in-flight with Escape.
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     true));
 
   // Now check for expected results.
-  tab1.reset(browser->GetTab(0));
+  tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
-  tab2.reset(browser->GetTab(1));
+  tab2 = browser->GetTab(1);
   ASSERT_TRUE(tab2.get());
   GURL tab2_new_url;
   ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
-  tab3.reset(browser->GetTab(2));
+  tab3 = browser->GetTab(2);
   ASSERT_TRUE(tab3.get());
   GURL tab3_new_url;
   ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url));
 
   // The tabs should be in their original positions.
   EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec());
   EXPECT_EQ(tab2_new_url.spec(), tab2_url.spec());
   EXPECT_EQ(tab3_new_url.spec(), tab3_url.spec());
 }
 
 // Drag Tab_2 out of the Tab strip. A new window should open with this tab.
 TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
-  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
-  scoped_ptr<WindowProxy> window(browser->GetWindow());
+  scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
   // Get Tab_1 which comes with the browser window.
-  scoped_ptr<TabProxy> tab1(browser->GetTab(0));
+  scoped_refptr<TabProxy> tab1(browser->GetTab(0));
   ASSERT_TRUE(tab1.get());
   GURL tab1_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_url));
 
   // Add Tab_2.
   GURL tab2_url("about:version");
   ASSERT_TRUE(browser->AppendTab(tab2_url));
-  scoped_ptr<TabProxy> tab2(browser->GetTab(1));
+  scoped_refptr<TabProxy> tab2(browser->GetTab(1));
   ASSERT_TRUE(tab2.get());
 
   // Add Tab_3.
   GURL tab3_url("about:plugins");
   ASSERT_TRUE(browser->AppendTab(tab3_url));
-  scoped_ptr<TabProxy> tab3(browser->GetTab(2));
+  scoped_refptr<TabProxy> tab3(browser->GetTab(2));
   ASSERT_TRUE(tab3.get());
 
   // Make sure 3 tabs are opened.
   ASSERT_TRUE(browser->WaitForTabCountToBecome(initial_tab_count + 2,
                                                10000));
 
   // Make sure all the tab URL specs are different.
   ASSERT_TRUE(tab1_url != tab2_url);
   ASSERT_TRUE(tab1_url != tab3_url);
   ASSERT_TRUE(tab2_url != tab3_url);
@@ skipping 58 matching lines @@
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now, first make sure that the old window has only two tabs remaining.
   int new_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&new_tab_count));
   ASSERT_EQ(2, new_tab_count);
 
   // Get the two tabs - they are called Tab_1 and Tab_2 in the old window.
-  tab1.reset(browser->GetTab(0));
+  tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
-  tab2.reset(browser->GetTab(1));
+  tab2 = browser->GetTab(1);
   ASSERT_TRUE(tab2.get());
   GURL tab2_new_url;
   ASSERT_TRUE(tab2->GetCurrentURL(&tab2_new_url));
 
   // Now check for proper shifting of tabs; i.e., Tab_3 in window 1 should
   // shift left to the position of Tab_2; Tab_1 should stay where it was.
   EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec());
   EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec());
 
   // Now check to make sure a new window has opened.
-  scoped_ptr<BrowserProxy> browser2(automation()->GetBrowserWindow(1));
+  scoped_refptr<BrowserProxy> browser2(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(browser2.get());
-  scoped_ptr<WindowProxy> window2(browser2->GetWindow());
+  scoped_refptr<WindowProxy> window2(browser2->GetWindow());
   ASSERT_TRUE(window2.get());
 
   // Make sure that the new window has only one tab.
   int tab_count_window_2 = 0;
   ASSERT_TRUE(browser2->GetTabCount(&tab_count_window_2));
   ASSERT_EQ(1, tab_count_window_2);
 
   // Get Tab_1_2 which should be Tab_1 in Window 2.
-  scoped_ptr<TabProxy> tab1_2(browser2->GetTab(0));
+  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());
 }