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

Unified Diff: chrome/browser/extensions/api/braille_display_private/braille_display_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/braille_display_private/braille_display_private_apitest.cc
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
index 9aad594c2409bb7743a0ccccc78a6ce07d7d8b48..c69dc92cc276e77ae58d41383076e48ec369bfd4 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
@@ -169,8 +169,8 @@ class BrailleDisplayPrivateApiTest : public ExtensionApiTest {
}
private:
- scoped_ptr<BrlapiConnection> CreateBrlapiConnection() {
- return scoped_ptr<BrlapiConnection>(
+ std::unique_ptr<BrlapiConnection> CreateBrlapiConnection() {
+ return std::unique_ptr<BrlapiConnection>(
new MockBrlapiConnection(&connection_data_));
}
@@ -277,7 +277,9 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest {
int GetEventCount() { return event_count_; }
- void BroadcastEvent(scoped_ptr<Event> event) override { ++event_count_; }
+ void BroadcastEvent(std::unique_ptr<Event> event) override {
+ ++event_count_;
+ }
bool HasListener() override { return true; }
private:
@@ -287,7 +289,7 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest {
MockEventDelegate* SetMockEventDelegate(BrailleDisplayPrivateAPI* api) {
MockEventDelegate* delegate = new MockEventDelegate();
api->SetEventDelegateForTest(
- scoped_ptr<BrailleDisplayPrivateAPI::EventDelegate>(delegate));
+ std::unique_ptr<BrailleDisplayPrivateAPI::EventDelegate>(delegate));
return delegate;
}
@@ -326,7 +328,7 @@ class BrailleDisplayPrivateAPIUserTest : public BrailleDisplayPrivateApiTest {
#endif
IN_PROC_BROWSER_TEST_F(BrailleDisplayPrivateAPIUserTest,
MAYBE_KeyEventOnLockScreen) {
- scoped_ptr<ScreenLockerTester> tester(ScreenLocker::GetTester());
+ std::unique_ptr<ScreenLockerTester> tester(ScreenLocker::GetTester());
// Log in.
user_manager::UserManager::Get()->UserLoggedIn(
AccountId::FromUserEmail(kTestUserName), kTestUserName, true);

Powered by Google App Engine
This is Rietveld 408576698