Index: chrome/browser/ui/bookmarks/bookmark_unittest.cc |
diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc |
index 83d5445e2a4a4a0505abfe3f15e60db899ba37a1..80aaf543481d3719a82d9a29cb3369c575a69be1 100644 |
--- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc |
+++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc |
@@ -2,8 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "chrome/browser/search_engines/template_url_service_factory.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/common/url_constants.h" |
@@ -59,12 +61,13 @@ class BookmarkInstantExtendedTest : public BrowserWithTestWindowTest { |
} |
private: |
- static scoped_ptr<KeyedService> CreateTemplateURLService( |
+ static std::unique_ptr<KeyedService> CreateTemplateURLService( |
content::BrowserContext* profile) { |
- return make_scoped_ptr(new TemplateURLService( |
- static_cast<Profile*>(profile)->GetPrefs(), |
- make_scoped_ptr(new SearchTermsData), NULL, |
- scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure())); |
+ return base::WrapUnique( |
+ new TemplateURLService(static_cast<Profile*>(profile)->GetPrefs(), |
+ base::WrapUnique(new SearchTermsData), NULL, |
+ std::unique_ptr<TemplateURLServiceClient>(), |
+ NULL, NULL, base::Closure())); |
} |
DISALLOW_COPY_AND_ASSIGN(BookmarkInstantExtendedTest); |