summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-28 19:12:46 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-28 19:12:46 +0000
commit802376eb9aacca5284b76da93face73a9488bdb6 (patch)
tree705226a6750fed9a1429aaf07fe9c0a03303c759 /chrome/test/memory_test
parent319d4ae6c8b2236fa7e0acf218c533a5a93af5a6 (diff)
downloadchromium_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/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index ffddf51..e06727d 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -213,8 +213,8 @@ class MemoryTest : public UITest {
size_t start_size = GetSystemCommitCharge();
// Cycle through the URLs.
- scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
- scoped_ptr<TabProxy> tab(window->GetActiveTab());
+ scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
+ scoped_refptr<TabProxy> tab(window->GetActiveTab());
int expected_tab_count = 1;
for (unsigned counter = 0; counter < arraysize(urls); ++counter) {
std::string url = urls[counter];
@@ -233,12 +233,12 @@ class MemoryTest : public UITest {
EXPECT_TRUE(window->AppendTab(GURL(url)));
expected_tab_count++;
WaitUntilTabCount(expected_tab_count);
- tab.reset(window->GetActiveTab());
+ tab = window->GetActiveTab();
continue;
}
int tab_index = counter % num_target_tabs; // A pseudo-random tab.
- tab.reset(window->GetTab(tab_index));
+ tab = window->GetTab(tab_index);
}
const int kMaxWaitTime = 5000;