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

Unified Diff: extensions/browser/api/power/power_api_unittest.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: extensions/browser/api/power/power_api_unittest.cc
diff --git a/extensions/browser/api/power/power_api_unittest.cc b/extensions/browser/api/power/power_api_unittest.cc
index 693abd10b0476f6099750cdcb4e6585d83dd4e79..54b8403d9e42ed92388f68b215a5e987fd82f776 100644
--- a/extensions/browser/api/power/power_api_unittest.cc
+++ b/extensions/browser/api/power/power_api_unittest.cc
@@ -5,11 +5,11 @@
#include "extensions/browser/api/power/power_api.h"
#include <deque>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/power_save_blocker.h"
#include "extensions/browser/api_test_utils.h"
@@ -88,7 +88,7 @@ class PowerSaveBlockerStubManager {
private:
// Creates a new PowerSaveBlockerStub of type |type|.
- scoped_ptr<content::PowerSaveBlocker> CreateStub(
+ std::unique_ptr<content::PowerSaveBlocker> CreateStub(
content::PowerSaveBlocker::PowerSaveBlockerType type,
content::PowerSaveBlocker::Reason reason,
const std::string& description) {
@@ -103,11 +103,9 @@ class PowerSaveBlockerStubManager {
unblock_request = UNBLOCK_DISPLAY_SLEEP;
break;
}
- return scoped_ptr<content::PowerSaveBlocker>(
- new PowerSaveBlockerStub(
- base::Bind(&PowerSaveBlockerStubManager::AppendRequest,
- weak_ptr_factory_.GetWeakPtr(),
- unblock_request)));
+ return std::unique_ptr<content::PowerSaveBlocker>(new PowerSaveBlockerStub(
+ base::Bind(&PowerSaveBlockerStubManager::AppendRequest,
+ weak_ptr_factory_.GetWeakPtr(), unblock_request)));
}
void AppendRequest(Request request) {
@@ -169,7 +167,7 @@ class PowerAPITest : public ApiUnitTest {
UnloadedExtensionInfo::REASON_UNINSTALL);
}
- scoped_ptr<PowerSaveBlockerStubManager> manager_;
+ std::unique_ptr<PowerSaveBlockerStubManager> manager_;
};
TEST_F(PowerAPITest, RequestAndRelease) {
« no previous file with comments | « extensions/browser/api/power/power_api.cc ('k') | extensions/browser/api/printer_provider/printer_provider_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698