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

Unified Diff: chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 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: chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
index 551b85f5847eee9dca259bf6da0409c88ff709fd..37699dffde3acd7495517cf76a58f10baa1aacb3 100644
--- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
+++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -85,7 +87,7 @@ class MockAudioHistoryHandler : public HotwordAudioHistoryHandler {
}
private:
- scoped_ptr<history::WebHistoryService> web_history_;
+ std::unique_ptr<history::WebHistoryService> web_history_;
};
class MockHotwordService : public HotwordService {
@@ -100,8 +102,8 @@ class MockHotwordService : public HotwordService {
service_available_ = available;
}
- static scoped_ptr<KeyedService> Build(content::BrowserContext* profile) {
- return make_scoped_ptr(
+ static std::unique_ptr<KeyedService> Build(content::BrowserContext* profile) {
+ return base::WrapUnique(
new MockHotwordService(static_cast<Profile*>(profile)));
}

Powered by Google App Engine
This is Rietveld 408576698