summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 02:35:35 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 02:35:35 +0000
commit5ec59f251a83117d1985d772fdae53bcb9d5f722 (patch)
tree024d98765f47ec722c6f9300bd98db924c25a174
parent94f50a7f4e8e09543d4868d2111617742befa1c0 (diff)
downloadchromium_src-5ec59f251a83117d1985d772fdae53bcb9d5f722.zip
chromium_src-5ec59f251a83117d1985d772fdae53bcb9d5f722.tar.gz
chromium_src-5ec59f251a83117d1985d772fdae53bcb9d5f722.tar.bz2
Fix the last scoped_refptr misuses in NewRunnableMethod.
BUG=28083 TEST=builds Review URL: http://codereview.chromium.org/5852001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69220 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/download_item.cc3
-rw-r--r--remoting/jingle_glue/jingle_client_unittest.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_webblobregistry_impl.cc3
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc
index 1d93667..43321aa 100644
--- a/chrome/browser/download/download_item.cc
+++ b/chrome/browser/download/download_item.cc
@@ -404,7 +404,8 @@ void DownloadItem::OnSafeDownloadFinished(DownloadFileManager* file_manager) {
BrowserThread::FILE, FROM_HERE,
NewRunnableMethod(
file_manager, &DownloadFileManager::OnFinalDownloadName,
- id(), GetTargetFilePath(), false, download_manager_));
+ id(), GetTargetFilePath(), false,
+ make_scoped_refptr(download_manager_)));
return;
}
diff --git a/remoting/jingle_glue/jingle_client_unittest.cc b/remoting/jingle_glue/jingle_client_unittest.cc
index 38236f4..08452c3 100644
--- a/remoting/jingle_glue/jingle_client_unittest.cc
+++ b/remoting/jingle_glue/jingle_client_unittest.cc
@@ -57,7 +57,7 @@ TEST_F(JingleClientTest, OnStateChanged) {
base::WaitableEvent state_changed_event(true, false);
thread_.message_loop()->PostTask(FROM_HERE, NewRunnableFunction(
- &JingleClientTest::ChangeState, client_.get(),
+ &JingleClientTest::ChangeState, client_,
buzz::XmppEngine::STATE_OPENING, &state_changed_event));
state_changed_event.Wait();
@@ -73,7 +73,7 @@ TEST_F(JingleClientTest, Close) {
client_->Close();
// Verify that the channel doesn't call callback anymore.
thread_.message_loop()->PostTask(FROM_HERE, NewRunnableFunction(
- &JingleClientTest::ChangeState, client_.get(),
+ &JingleClientTest::ChangeState, client_,
buzz::XmppEngine::STATE_OPENING,
static_cast<base::WaitableEvent*>(NULL)));
thread_.Stop();
diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
index 65596ae..08ada76 100644
--- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
+++ b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
@@ -49,7 +49,7 @@ void TestShellWebBlobRegistryImpl::registerBlobURL(
FROM_HERE,
NewRunnableMethod(
this, &TestShellWebBlobRegistryImpl::DoRegisterBlobUrl, url,
- blob_data.release())); // Released in DoRegisterBlobUrl.
+ blob_data));
}
void TestShellWebBlobRegistryImpl::registerBlobURL(
@@ -76,7 +76,6 @@ void TestShellWebBlobRegistryImpl::DoRegisterBlobUrl(
const GURL& url, webkit_blob::BlobData* blob_data) {
DCHECK(g_blob_storage_controller);
g_blob_storage_controller->RegisterBlobUrl(url, blob_data);
- blob_data->Release();
}
void TestShellWebBlobRegistryImpl::DoRegisterBlobUrlFrom(