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

Unified Diff: chrome/browser/chromeos/power/extension_event_observer.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/chromeos/power/extension_event_observer.cc
diff --git a/chrome/browser/chromeos/power/extension_event_observer.cc b/chrome/browser/chromeos/power/extension_event_observer.cc
index 3bc7964a8c0d314cf9876e98b2baa4928ea49f39..42e5b0bea4def803e2b4fc2a50e608dc91d88a25 100644
--- a/chrome/browser/chromeos/power/extension_event_observer.cc
+++ b/chrome/browser/chromeos/power/extension_event_observer.cc
@@ -4,9 +4,11 @@
#include "chrome/browser/chromeos/power/extension_event_observer.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/thread_task_runner_handle.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile.h"
@@ -84,9 +86,9 @@ ExtensionEventObserver::~ExtensionEventObserver() {
DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
}
-scoped_ptr<ExtensionEventObserver::TestApi>
+std::unique_ptr<ExtensionEventObserver::TestApi>
ExtensionEventObserver::CreateTestApi() {
- return make_scoped_ptr(
+ return base::WrapUnique(
new ExtensionEventObserver::TestApi(weak_factory_.GetWeakPtr()));
}
@@ -130,7 +132,7 @@ void ExtensionEventObserver::OnBackgroundHostCreated(
return;
auto result =
- keepalive_sources_.add(host, make_scoped_ptr(new KeepaliveSources()));
+ keepalive_sources_.add(host, base::WrapUnique(new KeepaliveSources()));
if (result.second)
host->AddObserver(this);
@@ -140,7 +142,7 @@ void ExtensionEventObserver::OnExtensionHostDestroyed(
const extensions::ExtensionHost* host) {
DCHECK(keepalive_sources_.contains(host));
- scoped_ptr<KeepaliveSources> sources =
+ std::unique_ptr<KeepaliveSources> sources =
keepalive_sources_.take_and_erase(host);
suspend_keepalive_count_ -= sources->unacked_push_messages.size();

Powered by Google App Engine
This is Rietveld 408576698