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 { ...@@ -26,7 +26,7 @@ class ShellExtensionsDelegate : public ExtensionsDelegate {
} }
virtual const extensions::ExtensionSet& GetInstalledExtensions() OVERRIDE { virtual const extensions::ExtensionSet& GetInstalledExtensions() OVERRIDE {
shell_extensions_.Clear(); shell_extensions_.Clear();
if (extension_system_->extension()) if (extension_system_->extension().get())
shell_extensions_.Insert(extension_system_->extension()); shell_extensions_.Insert(extension_system_->extension());
return shell_extensions_; return shell_extensions_;
} }
......
...@@ -218,7 +218,7 @@ ProvidedFileSystemInterface::AbortCallback FakeProvidedFileSystem::ReadFile( ...@@ -218,7 +218,7 @@ ProvidedFileSystemInterface::AbortCallback FakeProvidedFileSystem::ReadFile(
const bool has_more = const bool has_more =
(current_offset + 1 < entry->metadata->size) && (current_length - 1); (current_offset + 1 < entry->metadata->size) && (current_length - 1);
const int task_id = tracker_.PostTask( const int task_id = tracker_.PostTask(
base::MessageLoopProxy::current(), base::MessageLoopProxy::current().get(),
FROM_HERE, FROM_HERE,
base::Bind( base::Bind(
callback, 1 /* chunk_length */, has_more, base::File::FILE_OK)); callback, 1 /* chunk_length */, has_more, base::File::FILE_OK));
...@@ -344,8 +344,8 @@ FakeProvidedFileSystem::GetWeakPtr() { ...@@ -344,8 +344,8 @@ FakeProvidedFileSystem::GetWeakPtr() {
ProvidedFileSystemInterface::AbortCallback ProvidedFileSystemInterface::AbortCallback
FakeProvidedFileSystem::PostAbortableTask(const base::Closure& callback) { FakeProvidedFileSystem::PostAbortableTask(const base::Closure& callback) {
const int task_id = const int task_id = tracker_.PostTask(
tracker_.PostTask(base::MessageLoopProxy::current(), FROM_HERE, callback); base::MessageLoopProxy::current().get(), FROM_HERE, callback);
return base::Bind( return base::Bind(
&FakeProvidedFileSystem::Abort, weak_ptr_factory_.GetWeakPtr(), task_id); &FakeProvidedFileSystem::Abort, weak_ptr_factory_.GetWeakPtr(), task_id);
} }
......
...@@ -295,7 +295,7 @@ storage::FileSystemOperation* FileSystemBackend::CreateFileSystemOperation( ...@@ -295,7 +295,7 @@ storage::FileSystemOperation* FileSystemBackend::CreateFileSystemOperation(
url, url,
context, context,
make_scoped_ptr(new storage::FileSystemOperationContext( make_scoped_ptr(new storage::FileSystemOperationContext(
context, MediaFileSystemBackend::MediaTaskRunner()))); context, MediaFileSystemBackend::MediaTaskRunner().get())));
} }
DCHECK(url.type() == storage::kFileSystemTypeNativeLocal || DCHECK(url.type() == storage::kFileSystemTypeNativeLocal ||
......
...@@ -39,7 +39,7 @@ void ScreenlockIconSource::StartDataRequest( ...@@ -39,7 +39,7 @@ void ScreenlockIconSource::StartDataRequest(
int render_frame_id, int render_frame_id,
const content::URLDataSource::GotDataCallback& callback) { const content::URLDataSource::GotDataCallback& callback) {
if (!icon_provider_) { if (!icon_provider_) {
callback.Run(GetDefaultIcon().As1xPNGBytes()); callback.Run(GetDefaultIcon().As1xPNGBytes().get());
return; return;
} }
...@@ -50,7 +50,7 @@ void ScreenlockIconSource::StartDataRequest( ...@@ -50,7 +50,7 @@ void ScreenlockIconSource::StartDataRequest(
gfx::Image image = icon_provider_->GetIcon(username); gfx::Image image = icon_provider_->GetIcon(username);
if (image.IsEmpty()) { if (image.IsEmpty()) {
callback.Run(GetDefaultIcon().As1xPNGBytes()); callback.Run(GetDefaultIcon().As1xPNGBytes().get());
return; return;
} }
......
...@@ -72,7 +72,7 @@ class BlockingMethodCallerTest : public testing::Test { ...@@ -72,7 +72,7 @@ class BlockingMethodCallerTest : public testing::Test {
// Set an expectation so mock_bus's GetDBusTaskRunner will return the fake // Set an expectation so mock_bus's GetDBusTaskRunner will return the fake
// task runner. // task runner.
EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner()) EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner())
.WillRepeatedly(Return(task_runner_)); .WillRepeatedly(Return(task_runner_.get()));
// ShutdownAndBlock() will be called in TearDown(). // ShutdownAndBlock() will be called in TearDown().
EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return()); EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
......
...@@ -156,7 +156,7 @@ void ShillClientUnittestBase::SetUp() { ...@@ -156,7 +156,7 @@ void ShillClientUnittestBase::SetUp() {
// Set an expectation so mock_bus's GetDBusTaskRunner will return the current // Set an expectation so mock_bus's GetDBusTaskRunner will return the current
// task runner. // task runner.
EXPECT_CALL(*mock_bus_.get(), GetDBusTaskRunner()) 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(). // ShutdownAndBlock() will be called in TearDown().
EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return()); 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