diff options
author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 19:12:46 +0000 |
---|---|---|
committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-28 19:12:46 +0000 |
commit | 802376eb9aacca5284b76da93face73a9488bdb6 (patch) | |
tree | 705226a6750fed9a1429aaf07fe9c0a03303c759 /chrome/browser/download | |
parent | 319d4ae6c8b2236fa7e0acf218c533a5a93af5a6 (diff) | |
download | chromium_src-802376eb9aacca5284b76da93face73a9488bdb6.zip chromium_src-802376eb9aacca5284b76da93face73a9488bdb6.tar.gz chromium_src-802376eb9aacca5284b76da93face73a9488bdb6.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/download')
-rw-r--r-- | chrome/browser/download/download_uitest.cc | 10 | ||||
-rw-r--r-- | chrome/browser/download/save_page_uitest.cc | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index 18eaed2..78a3683 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -124,14 +124,14 @@ class DownloadTest : public UITest { // Complete sending the request. We do this by loading a second URL in a // separate tab. - scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); + scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); EXPECT_TRUE(window->AppendTab(GURL( URLRequestSlowDownloadJob::kFinishDownloadUrl))); EXPECT_EQ(2, GetTabCount()); // TODO(tc): check download status text // Make sure the download shelf is showing. - scoped_ptr<TabProxy> dl_tab(window->GetTab(0)); + scoped_refptr<TabProxy> dl_tab(window->GetTab(0)); ASSERT_TRUE(dl_tab.get()); EXPECT_TRUE(WaitForDownloadShelfVisible(dl_tab.get())); } @@ -170,7 +170,7 @@ TEST_F(DownloadTest, DownloadMimeType) { CleanUpDownload(file); - scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); + scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); EXPECT_TRUE(WaitForDownloadShelfVisible(tab_proxy.get())); } @@ -196,7 +196,7 @@ TEST_F(DownloadTest, NoDownload) { if (file_util::PathExists(file_path)) ASSERT_TRUE(file_util::Delete(file_path, false)); - scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); + scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); EXPECT_FALSE(WaitForDownloadShelfVisible(tab_proxy.get())); } @@ -219,7 +219,7 @@ TEST_F(DownloadTest, ContentDisposition) { CleanUpDownload(download_file, file); // Ensure the download shelf is visible on the current tab. - scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); + scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); EXPECT_TRUE(WaitForDownloadShelfVisible(tab_proxy.get())); } diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc index 9172680..4562d20 100644 --- a/chrome/browser/download/save_page_uitest.cc +++ b/chrome/browser/download/save_page_uitest.cc @@ -79,7 +79,7 @@ TEST_F(SavePageTest, SaveHTMLOnly) { GURL url = URLRequestMockHTTPJob::GetMockUrl( UTF8ToWide(kTestDir + "/" + file_name)); - scoped_ptr<TabProxy> tab(GetActiveTab()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -99,7 +99,7 @@ TEST_F(SavePageTest, SaveCompleteHTML) { GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" + file_name)); - scoped_ptr<TabProxy> tab(GetActiveTab()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -121,7 +121,7 @@ TEST_F(SavePageTest, NoSave) { FilePath full_file_name = save_dir_.AppendASCII(file_name); FilePath dir = save_dir_.AppendASCII("c_files"); - scoped_ptr<TabProxy> tab(GetActiveTab()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(GURL("about:blank"))); WaitUntilTabCount(1); @@ -141,11 +141,11 @@ TEST_F(SavePageTest, FilenameFromPageTitle) { GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" + file_name)); - scoped_ptr<TabProxy> tab(GetActiveTab()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); - scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); automation()->SavePackageShouldPromptUser(false); EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE)); EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get())); @@ -173,11 +173,11 @@ TEST_F(SavePageTest, CleanFilenameFromPageTitle) { GURL url = URLRequestMockHTTPJob::GetMockUrl(UTF8ToWide(kTestDir + "/" + file_name)); - scoped_ptr<TabProxy> tab(GetActiveTab()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); - scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); automation()->SavePackageShouldPromptUser(false); EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE)); EXPECT_TRUE(WaitForDownloadShelfVisible(tab.get())); |