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

Unified Diff: content/browser/gamepad/gamepad_service_unittest.cc

Issue 1874893002: Convert //content/browser 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
« no previous file with comments | « content/browser/gamepad/gamepad_service.cc ('k') | content/browser/gamepad/gamepad_test_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gamepad/gamepad_service_unittest.cc
diff --git a/content/browser/gamepad/gamepad_service_unittest.cc b/content/browser/gamepad/gamepad_service_unittest.cc
index 5b9d1c28e189bdbe3b0014c6321313d85c5d9a2f..db16d6b5d59412d9cba2eda00ed6efdeefc4402c 100644
--- a/content/browser/gamepad/gamepad_service_unittest.cc
+++ b/content/browser/gamepad/gamepad_service_unittest.cc
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/browser/gamepad/gamepad_service.h"
+
#include <string.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "content/browser/gamepad/gamepad_consumer.h"
-#include "content/browser/gamepad/gamepad_service.h"
#include "content/browser/gamepad/gamepad_test_helpers.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -69,7 +71,7 @@ class GamepadServiceTest : public testing::Test {
private:
MockGamepadDataFetcher* fetcher_;
GamepadService* service_;
- scoped_ptr<ConnectionListener> connection_listener_;
+ std::unique_ptr<ConnectionListener> connection_listener_;
TestBrowserThreadBundle browser_thread_;
WebGamepads test_data_;
@@ -92,7 +94,7 @@ GamepadServiceTest::~GamepadServiceTest() {
void GamepadServiceTest::SetUp() {
fetcher_ = new MockGamepadDataFetcher(test_data_);
- service_ = new GamepadService(scoped_ptr<GamepadDataFetcher>(fetcher_));
+ service_ = new GamepadService(std::unique_ptr<GamepadDataFetcher>(fetcher_));
connection_listener_.reset((new ConnectionListener));
service_->ConsumerBecameActive(connection_listener_.get());
}
« no previous file with comments | « content/browser/gamepad/gamepad_service.cc ('k') | content/browser/gamepad/gamepad_test_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698