Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
diff --git a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
index 5c4c22d0292bf82b1cbe4f3ef3c130fc86915e23..79aa76d2f5b007fc29038c4330854def9cbf1b7d 100644
--- a/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
+++ b/ios/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -4,6 +4,8 @@
#include "ios/chrome/browser/dom_distiller/dom_distiller_service_factory.h"
+#include <utility>
+
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/singleton.h"
@@ -34,10 +36,10 @@ class DomDistillerKeyedService
scoped_ptr<dom_distiller::DistillerFactory> distiller_factory,
scoped_ptr<dom_distiller::DistillerPageFactory> distiller_page_factory,
scoped_ptr<dom_distiller::DistilledPagePrefs> distilled_page_prefs)
- : DomDistillerService(store.Pass(),
- distiller_factory.Pass(),
- distiller_page_factory.Pass(),
- distilled_page_prefs.Pass()) {}
+ : DomDistillerService(std::move(store),
+ std::move(distiller_factory),
+ std::move(distiller_page_factory),
+ std::move(distilled_page_prefs)) {}
~DomDistillerKeyedService() override {}
@@ -83,7 +85,7 @@ scoped_ptr<KeyedService> DomDistillerServiceFactory::BuildServiceInstanceFor(
context->GetStatePath().Append(FILE_PATH_LITERAL("Articles")));
scoped_ptr<DomDistillerStore> dom_distiller_store(
- new DomDistillerStore(db.Pass(), database_dir));
+ new DomDistillerStore(std::move(db), database_dir));
scoped_ptr<DistillerPageFactory> distiller_page_factory(
new DistillerPageFactoryIOS(context));
@@ -91,14 +93,14 @@ scoped_ptr<KeyedService> DomDistillerServiceFactory::BuildServiceInstanceFor(
new DistillerURLFetcherFactory(context->GetRequestContext()));
dom_distiller::proto::DomDistillerOptions options;
- scoped_ptr<DistillerFactory> distiller_factory(
- new DistillerFactoryImpl(distiller_url_fetcher_factory.Pass(), options));
+ scoped_ptr<DistillerFactory> distiller_factory(new DistillerFactoryImpl(
+ std::move(distiller_url_fetcher_factory), options));
scoped_ptr<DistilledPagePrefs> distilled_page_prefs(new DistilledPagePrefs(
ios::ChromeBrowserState::FromBrowserState(context)->GetPrefs()));
return make_scoped_ptr(new DomDistillerKeyedService(
- dom_distiller_store.Pass(), distiller_factory.Pass(),
- distiller_page_factory.Pass(), distilled_page_prefs.Pass()));
+ std::move(dom_distiller_store), std::move(distiller_factory),
+ std::move(distiller_page_factory), std::move(distilled_page_prefs)));
}
web::BrowserState* DomDistillerServiceFactory::GetBrowserStateToUse(
« no previous file with comments | « ios/chrome/browser/dom_distiller/distiller_viewer.cc ('k') | ios/chrome/browser/favicon/large_icon_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698