Make automation proxy objects to ref_counted. That allows to process async notifications directly in channel background thread. Add support for listener-less ChannelProxy.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/113722

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17093 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 61 insertions, 61 deletions

diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
index 3faf68a..df8dd60 100644
--- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
+++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc
@@ -27,13 +27,13 @@ class InteractiveConstrainedWindowTest : public UITest {
   virtual void SetUp() {
     UITest::SetUp();
 
-    browser_.reset(automation()->GetBrowserWindow(0));
+    browser_ = automation()->GetBrowserWindow(0);
     ASSERT_TRUE(browser_.get());
 
-    window_.reset(browser_->GetWindow());
+    window_ = browser_->GetWindow();
     ASSERT_TRUE(window_.get());
 
-    tab_.reset(browser_->GetTab(0));
+    tab_ = browser_->GetTab(0);
     ASSERT_TRUE(tab_.get());
   }
 
@@ -44,7 +44,7 @@ class InteractiveConstrainedWindowTest : public UITest {
     ASSERT_TRUE(tab_->NavigateToURL(net::FilePathToFileURL(filename)));
   }
 
-  void SimulateClickInCenterOf(const scoped_ptr<WindowProxy>& window) {
+  void SimulateClickInCenterOf(const scoped_refptr<WindowProxy>& window) {
     gfx::Rect tab_view_bounds;
     ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER,
                                       &tab_view_bounds, true));
@@ -57,9 +57,9 @@ class InteractiveConstrainedWindowTest : public UITest {
                                         views::Event::EF_LEFT_BUTTON_DOWN));
   }
 
-  scoped_ptr<BrowserProxy> browser_;
-  scoped_ptr<WindowProxy> window_;
-  scoped_ptr<TabProxy> tab_;
+  scoped_refptr<BrowserProxy> browser_;
+  scoped_refptr<WindowProxy> window_;
+  scoped_refptr<TabProxy> tab_;
 };
 
 TEST_F(InteractiveConstrainedWindowTest, TestOpenAndResizeTo) {
@@ -68,9 +68,9 @@ TEST_F(InteractiveConstrainedWindowTest, TestOpenAndResizeTo) {
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000));
 
-  scoped_ptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
+  scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser != NULL);
-  scoped_ptr<WindowProxy> popup_window(popup_browser->GetWindow());
+  scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window != NULL);
 
   // Make sure we were created with the correct width and height.
@@ -127,16 +127,16 @@ TEST_F(InteractiveConstrainedWindowTest, DontSpawnEndlessPopups) {
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000));
 
-  scoped_ptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
+  scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
-  scoped_ptr<TabProxy> popup_tab(popup_browser->GetTab(0));
+  scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
 
   int constrained_window_count = 0;
   ASSERT_TRUE(popup_tab->WaitForChildWindowCountToChange(
                   0, &constrained_window_count, 10000));
   ASSERT_EQ(1, constrained_window_count);
-  scoped_ptr<ConstrainedWindowProxy> constrained_window(
+  scoped_refptr<ConstrainedWindowProxy> constrained_window(
       popup_tab->GetConstrainedWindow(0));
   ASSERT_TRUE(constrained_window.get());
 
@@ -183,13 +183,13 @@ TEST_F(InteractiveConstrainedWindowTest, WindowOpenWindowClosePopup) {
   PlatformThread::Sleep(1000);
 
   // Make sure we have a blocked popup notification
-  scoped_ptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
+  scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
-  scoped_ptr<WindowProxy> popup_window(popup_browser->GetWindow());
+  scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window.get());
-  scoped_ptr<TabProxy> popup_tab(popup_browser->GetTab(0));
+  scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
-  scoped_ptr<ConstrainedWindowProxy> popup_notification(
+  scoped_refptr<ConstrainedWindowProxy> popup_notification(
       popup_tab->GetConstrainedWindow(0));
   ASSERT_TRUE(popup_notification.get());
   std::wstring title;
@@ -214,7 +214,7 @@ TEST_F(InteractiveConstrainedWindowTest, BlockAlertFromBlockedPopup) {
   ASSERT_EQ(1, browser_window_count);
 
   // Ensure one blocked popup window: the popup didn't escape.
-  scoped_ptr<ConstrainedWindowProxy> popup_notification(
+  scoped_refptr<ConstrainedWindowProxy> popup_notification(
       tab_->GetConstrainedWindow(0));
   ASSERT_TRUE(popup_notification.get());
   std::wstring title;
@@ -230,11 +230,11 @@ TEST_F(InteractiveConstrainedWindowTest, ShowAlertFromNormalPopup) {
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 5000));
 
-  scoped_ptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
+  scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
-  scoped_ptr<WindowProxy> popup_window(popup_browser->GetWindow());
+  scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window.get());
-  scoped_ptr<TabProxy> popup_tab(popup_browser->GetTab(0));
+  scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
 
   SimulateClickInCenterOf(popup_window);
diff --git a/chrome/browser/views/find_bar_win_interactive_uitest.cc b/chrome/browser/views/find_bar_win_interactive_uitest.cc
index 21d2db0..43ad35c 100644
--- a/chrome/browser/views/find_bar_win_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_win_interactive_uitest.cc
@@ -56,21 +56,21 @@ TEST_F(FindInPageTest, CrashEscHandlers) {
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get() != NULL);
-  scoped_ptr<WindowProxy> window(browser->GetWindow());
+  scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get() != NULL);
 
   // First we navigate to our test page (tab A).
   GURL url = server->TestServerPageW(kSimplePage);
-  scoped_ptr<TabProxy> tabA(GetActiveTab());
+  scoped_refptr<TabProxy> tabA(GetActiveTab());
   EXPECT_NE(AUTOMATION_MSG_NAVIGATION_ERROR, tabA->NavigateToURL(url));
 
   EXPECT_TRUE(browser->OpenFindInPage());
 
   // Open another tab (tab B).
   EXPECT_TRUE(browser->AppendTab(url));
-  scoped_ptr<TabProxy> tabB(GetActiveTab());
+  scoped_refptr<TabProxy> tabB(GetActiveTab());
 
   EXPECT_TRUE(browser->OpenFindInPage());
 
diff --git a/chrome/browser/views/find_bar_win_uitest.cc b/chrome/browser/views/find_bar_win_uitest.cc
index 6ec3200..5982e9e 100644
--- a/chrome/browser/views/find_bar_win_uitest.cc
+++ b/chrome/browser/views/find_bar_win_uitest.cc
@@ -25,11 +25,11 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
   ASSERT_TRUE(NULL != server.get());
 
   GURL url = server->TestServerPageW(kSimplePage);
-  scoped_ptr<TabProxy> tabA(GetActiveTab());
+  scoped_refptr<TabProxy> tabA(GetActiveTab());
   ASSERT_TRUE(tabA->NavigateToURL(url));
   WaitUntilTabCount(1);
 
-  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Toggle the bookmark bar state.
@@ -46,7 +46,7 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
 
   // Open another tab (tab B).
   EXPECT_TRUE(browser->AppendTab(url));
-  scoped_ptr<TabProxy> tabB(GetActiveTab());
+  scoped_refptr<TabProxy> tabB(GetActiveTab());
 
   // Close tab B.
   EXPECT_TRUE(tabB->Close(true));
@@ -67,7 +67,7 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
 
   // Open another tab (tab C).
   EXPECT_TRUE(browser->AppendTab(url));
-  scoped_ptr<TabProxy> tabC(GetActiveTab());
+  scoped_refptr<TabProxy> tabC(GetActiveTab());
 
   // Close it.
   EXPECT_TRUE(tabC->Close(true));
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 18226a1..e187e71 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -29,9 +29,9 @@ protected:
 // 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.
@@ -40,7 +40,7 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
   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));
@@ -48,13 +48,13 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
   // 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.
@@ -113,12 +113,12 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
                                     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));
@@ -130,9 +130,9 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) {
 // 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.
@@ -141,7 +141,7 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
   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));
@@ -149,13 +149,13 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
   // 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.
@@ -214,17 +214,17 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
                                     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));
@@ -237,9 +237,9 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) {
 // 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.
@@ -248,7 +248,7 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) {
   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));
@@ -256,13 +256,13 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) {
   // 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.
@@ -324,17 +324,17 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) {
                                     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));
@@ -347,9 +347,9 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) {
 
 // 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.
@@ -358,7 +358,7 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   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));
@@ -366,13 +366,13 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   // 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.
@@ -451,12 +451,12 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   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));
@@ -467,9 +467,9 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   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.
@@ -478,7 +478,7 @@ TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   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));