Commit f913653c authored by dcheng's avatar dcheng Committed by Commit bot

Removing remaining CrOS implicit conversions from scoped_refptr to T*

Random fixups that the automated rewriting tool opted to skip.

BUG=110610

Review URL: https://codereview.chromium.org/578533002

Cr-Commit-Position: refs/heads/master@{#295135}
parent b7e5dc39
......@@ -26,7 +26,7 @@ class ShellExtensionsDelegate : public ExtensionsDelegate {
}
virtual const extensions::ExtensionSet& GetInstalledExtensions() OVERRIDE {
shell_extensions_.Clear();
if (extension_system_->extension())
if (extension_system_->extension().get())
shell_extensions_.Insert(extension_system_->extension());
return shell_extensions_;
}
......
......@@ -218,7 +218,7 @@ ProvidedFileSystemInterface::AbortCallback FakeProvidedFileSystem::ReadFile(
const bool has_more =
(current_offset + 1 < entry->metadata->size) && (current_length - 1);
const int task_id = tracker_.PostTask(
base::MessageLoopProxy::current(),
base::MessageLoopProxy::current().get(),
FROM_HERE,
base::Bind(
callback, 1 /* chunk_length */, has_more, base::File::FILE_OK));
......@@ -344,8 +344,8 @@ FakeProvidedFileSystem::GetWeakPtr() {
ProvidedFileSystemInterface::AbortCallback
FakeProvidedFileSystem::PostAbortableTask(const base::Closure& callback) {
const int task_id =
tracker_.PostTask(base::MessageLoopProxy::current(), FROM_HERE, callback);
const int task_id = tracker_.PostTask(
base::MessageLoopProxy::current().get(), FROM_HERE, callback);
return base::Bind(
&FakeProvidedFileSystem::Abort, weak_ptr_factory_.GetWeakPtr(), task_id);
}
......
......@@ -295,7 +295,7 @@ storage::FileSystemOperation* FileSystemBackend::CreateFileSystemOperation(
url,
context,
make_scoped_ptr(new storage::FileSystemOperationContext(
context, MediaFileSystemBackend::MediaTaskRunner())));
context, MediaFileSystemBackend::MediaTaskRunner().get())));
}
DCHECK(url.type() == storage::kFileSystemTypeNativeLocal ||
......
......@@ -39,7 +39,7 @@ void ScreenlockIconSource::StartDataRequest(
int render_frame_id,
const content::URLDataSource::GotDataCallback& callback) {
if (!icon_provider_) {
callback.Run(GetDefaultIcon().As1xPNGBytes());
callback.Run(GetDefaultIcon().As1xPNGBytes().get());
return;
}
......@@ -50,7 +50,7 @@ void ScreenlockIconSource::StartDataRequest(
gfx::Image image = icon_provider_->GetIcon(username);
if (image.IsEmpty()) {
callback.Run(GetDefaultIcon().As1xPNGBytes());
callback.Run(GetDefaultIcon().As1xPNGBytes().get());
return;
}
......
......@@ -72,7 +72,7 @@ class BlockingMethodCallerTest : public testing::Test {
// Set an expectation so mock_bus's GetDBusTaskRunner will return the fake
// task runner.
EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner())
.WillRepeatedly(Return(task_runner_));
.WillRepeatedly(Return(task_runner_.get()));
// ShutdownAndBlock() will be called in TearDown().
EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
......
......@@ -156,7 +156,7 @@ void ShillClientUnittestBase::SetUp() {
// Set an expectation so mock_bus's GetDBusTaskRunner will return the current
// task runner.
EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner())
.WillRepeatedly(Return(message_loop_.message_loop_proxy()));
.WillRepeatedly(Return(message_loop_.message_loop_proxy().get()));
// ShutdownAndBlock() will be called in TearDown().
EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment