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

Unified Diff: extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc

Issue 1908953003: Convert //extensions/{common,shell} 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
« no previous file with comments | « extensions/shell/browser/media_capture_util.cc ('k') | extensions/shell/browser/shell_browser_main_parts.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
index 15b1e5f006b94f829a461764a233990c4713933a..ec011910d321aaa0f32f407a05232bdfad6bc53d 100644
--- a/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
+++ b/extensions/shell/browser/shell_audio_controller_chromeos_unittest.cc
@@ -6,8 +6,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "chromeos/audio/audio_device.h"
#include "chromeos/audio/audio_devices_pref_handler.h"
#include "chromeos/audio/cras_audio_handler.h"
@@ -26,12 +28,12 @@ class ShellAudioControllerTest : public testing::Test {
public:
ShellAudioControllerTest() : next_node_id_(1) {
// This also initializes DBusThreadManager.
- scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
+ std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
chromeos::DBusThreadManager::GetSetterForTesting();
audio_client_ = new chromeos::FakeCrasAudioClient();
audio_client_->SetAudioNodesForTesting(AudioNodeList());
- dbus_setter->SetCrasAudioClient(make_scoped_ptr(audio_client_));
+ dbus_setter->SetCrasAudioClient(base::WrapUnique(audio_client_));
chromeos::CrasAudioHandler::InitializeForTesting();
audio_handler_ = chromeos::CrasAudioHandler::Get();
@@ -72,7 +74,7 @@ class ShellAudioControllerTest : public testing::Test {
chromeos::FakeCrasAudioClient* audio_client_; // Not owned.
chromeos::CrasAudioHandler* audio_handler_; // Not owned.
- scoped_ptr<ShellAudioController> controller_;
+ std::unique_ptr<ShellAudioController> controller_;
// Next audio node ID to be returned by CreateNode().
uint64_t next_node_id_;
« no previous file with comments | « extensions/shell/browser/media_capture_util.cc ('k') | extensions/shell/browser/shell_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698