| 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(
|
|
|