Commit 1d192de1 authored by dcheng's avatar dcheng Committed by Commit bot

Remove implicit conversions from scoped_refptr to T* in components/search_provider_logos/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

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

Cr-Commit-Position: refs/heads/master@{#292232}
parent 447e14fe
...@@ -196,7 +196,7 @@ void LogoCache::WriteLogo(scoped_refptr<base::RefCountedMemory> encoded_image) { ...@@ -196,7 +196,7 @@ void LogoCache::WriteLogo(scoped_refptr<base::RefCountedMemory> encoded_image) {
if (!EnsureCacheDirectoryExists()) if (!EnsureCacheDirectoryExists())
return; return;
if (!metadata_ || !encoded_image) { if (!metadata_ || !encoded_image.get()) {
DeleteLogoAndMetadata(); DeleteLogoAndMetadata();
return; return;
} }
......
...@@ -79,8 +79,8 @@ void ExpectMetadataEqual(const LogoMetadata& expected_metadata, ...@@ -79,8 +79,8 @@ void ExpectMetadataEqual(const LogoMetadata& expected_metadata,
void ExpectLogosEqual(const EncodedLogo& expected_logo, void ExpectLogosEqual(const EncodedLogo& expected_logo,
const EncodedLogo& actual_logo) { const EncodedLogo& actual_logo) {
ASSERT_TRUE(expected_logo.encoded_image); ASSERT_TRUE(expected_logo.encoded_image.get());
ASSERT_TRUE(actual_logo.encoded_image); ASSERT_TRUE(actual_logo.encoded_image.get());
EXPECT_TRUE(expected_logo.encoded_image->Equals(actual_logo.encoded_image)); EXPECT_TRUE(expected_logo.encoded_image->Equals(actual_logo.encoded_image));
ExpectMetadataEqual(expected_logo.metadata, actual_logo.metadata); ExpectMetadataEqual(expected_logo.metadata, actual_logo.metadata);
} }
......
...@@ -107,7 +107,7 @@ void LogoTracker::GetLogo(LogoObserver* observer) { ...@@ -107,7 +107,7 @@ void LogoTracker::GetLogo(LogoObserver* observer) {
if (is_idle_) { if (is_idle_) {
is_idle_ = false; is_idle_ = false;
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
file_task_runner_, file_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(&GetLogoFromCacheOnFileThread, base::Bind(&GetLogoFromCacheOnFileThread,
logo_cache_, logo_cache_,
...@@ -208,7 +208,7 @@ void LogoTracker::FetchLogo() { ...@@ -208,7 +208,7 @@ void LogoTracker::FetchLogo() {
} }
fetcher_.reset(net::URLFetcher::Create(url, net::URLFetcher::GET, this)); fetcher_.reset(net::URLFetcher::Create(url, net::URLFetcher::GET, this));
fetcher_->SetRequestContext(request_context_getter_); fetcher_->SetRequestContext(request_context_getter_.get());
fetcher_->Start(); fetcher_->Start();
} }
...@@ -218,7 +218,7 @@ void LogoTracker::OnFreshLogoParsed(scoped_ptr<EncodedLogo> logo) { ...@@ -218,7 +218,7 @@ void LogoTracker::OnFreshLogoParsed(scoped_ptr<EncodedLogo> logo) {
if (logo) if (logo)
logo->metadata.source_url = logo_url_.spec(); logo->metadata.source_url = logo_url_.spec();
if (!logo || !logo->encoded_image) { if (!logo || !logo->encoded_image.get()) {
OnFreshLogoAvailable(logo.Pass(), SkBitmap()); OnFreshLogoAvailable(logo.Pass(), SkBitmap());
} else { } else {
// Store the value of logo->encoded_image for use below. This ensures that // Store the value of logo->encoded_image for use below. This ensures that
...@@ -237,7 +237,7 @@ void LogoTracker::OnFreshLogoAvailable(scoped_ptr<EncodedLogo> encoded_logo, ...@@ -237,7 +237,7 @@ void LogoTracker::OnFreshLogoAvailable(scoped_ptr<EncodedLogo> encoded_logo,
const SkBitmap& image) { const SkBitmap& image) {
DCHECK(!is_idle_); DCHECK(!is_idle_);
if (encoded_logo && !encoded_logo->encoded_image && cached_logo_ && if (encoded_logo && !encoded_logo->encoded_image.get() && cached_logo_ &&
!encoded_logo->metadata.fingerprint.empty() && !encoded_logo->metadata.fingerprint.empty() &&
encoded_logo->metadata.fingerprint == encoded_logo->metadata.fingerprint ==
cached_logo_->metadata.fingerprint) { cached_logo_->metadata.fingerprint) {
...@@ -282,11 +282,10 @@ void LogoTracker::OnURLFetchComplete(const net::URLFetcher* source) { ...@@ -282,11 +282,10 @@ void LogoTracker::OnURLFetchComplete(const net::URLFetcher* source) {
base::Time response_time = clock_->Now(); base::Time response_time = clock_->Now();
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
background_task_runner_, background_task_runner_.get(),
FROM_HERE, FROM_HERE,
base::Bind(parse_logo_response_func_, base::Bind(
base::Passed(&response), parse_logo_response_func_, base::Passed(&response), response_time),
response_time),
base::Bind(&LogoTracker::OnFreshLogoParsed, base::Bind(&LogoTracker::OnFreshLogoParsed,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
} }
......
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