| Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
|
| index 912e6f70d9a08fa09ab86372523509b8593640f2..0334d1373d63604ad15019d8f3b6c39177a4c411 100644
|
| --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/callback.h"
|
| #include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -157,15 +158,15 @@ class HistoryServiceMock : public history::HistoryService {
|
| scoped_refptr<history::HistoryBackend> backend_;
|
| };
|
|
|
| -KeyedService* BuildFakeProfileInvalidationProvider(
|
| +scoped_ptr<KeyedService> BuildFakeProfileInvalidationProvider(
|
| content::BrowserContext* context) {
|
| - return new invalidation::ProfileInvalidationProvider(
|
| + return make_scoped_ptr(new invalidation::ProfileInvalidationProvider(
|
| scoped_ptr<invalidation::InvalidationService>(
|
| - new invalidation::FakeInvalidationService));
|
| + new invalidation::FakeInvalidationService)));
|
| }
|
|
|
| -KeyedService* BuildHistoryService(content::BrowserContext* profile) {
|
| - return new HistoryServiceMock;
|
| +scoped_ptr<KeyedService> BuildHistoryService(content::BrowserContext* profile) {
|
| + return scoped_ptr<KeyedService>(new HistoryServiceMock);
|
| }
|
|
|
| class TestTypedUrlModelAssociator : public TypedUrlModelAssociator {
|
|
|