diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-26 14:45:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 22:46:08 +0000 |
| commit | 51ace48ad51bae53cef3d63a27fbabeb7d0ecafa (patch) | |
| tree | 75688ca279a49d844a7f7b08026836c7e352ccfd /components/search_provider_logos/logo_tracker.cc | |
| parent | 4a9d9829bc889e6a2cc02dbc443d3032e1d2c81f (diff) | |
| download | chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.zip chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.gz chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.bz2 | |
Convert Pass()→std::move() in //components/[n-z]*
BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1548203002
Cr-Commit-Position: refs/heads/master@{#366914}
Diffstat (limited to 'components/search_provider_logos/logo_tracker.cc')
| -rw-r--r-- | components/search_provider_logos/logo_tracker.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/search_provider_logos/logo_tracker.cc b/components/search_provider_logos/logo_tracker.cc index 43536fe..c50b42c 100644 --- a/components/search_provider_logos/logo_tracker.cc +++ b/components/search_provider_logos/logo_tracker.cc @@ -5,6 +5,7 @@ #include "components/search_provider_logos/logo_tracker.h" #include <algorithm> +#include <utility> #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" @@ -55,7 +56,7 @@ scoped_ptr<EncodedLogo> GetLogoFromCacheOnFileThread(LogoCache* logo_cache, return scoped_ptr<EncodedLogo>(); } - return logo_cache->GetCachedLogo().Pass(); + return logo_cache->GetCachedLogo(); } void DeleteLogoCacheOnFileThread(LogoCache* logo_cache) { @@ -72,7 +73,7 @@ LogoTracker::LogoTracker( scoped_ptr<LogoDelegate> delegate) : is_idle_(true), is_cached_logo_valid_(false), - logo_delegate_(delegate.Pass()), + logo_delegate_(std::move(delegate)), logo_cache_(new LogoCache(cached_logo_directory)), clock_(new base::DefaultClock()), file_task_runner_(file_task_runner), @@ -135,7 +136,7 @@ void LogoTracker::SetLogoCacheForTests(scoped_ptr<LogoCache> cache) { } void LogoTracker::SetClockForTests(scoped_ptr<base::Clock> clock) { - clock_ = clock.Pass(); + clock_ = std::move(clock); } void LogoTracker::ReturnToIdle(int outcome) { @@ -227,7 +228,7 @@ void LogoTracker::OnFreshLogoParsed(bool* parsing_failed, logo->metadata.source_url = logo_url_.spec(); if (!logo || !logo->encoded_image.get()) { - OnFreshLogoAvailable(logo.Pass(), *parsing_failed, SkBitmap()); + OnFreshLogoAvailable(std::move(logo), *parsing_failed, SkBitmap()); } else { // Store the value of logo->encoded_image for use below. This ensures that // logo->encoded_image is evaulated before base::Passed(&logo), which sets @@ -286,7 +287,7 @@ void LogoTracker::OnFreshLogoAvailable(scoped_ptr<EncodedLogo> encoded_logo, FOR_EACH_OBSERVER(LogoObserver, logo_observers_, OnLogoAvailable(logo.get(), false)); - SetCachedLogo(encoded_logo.Pass()); + SetCachedLogo(std::move(encoded_logo)); } } |