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

Side by Side Diff: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

Issue 1858513002: chrome/browser/password_manager: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows -- revert unwanted change 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 else 496 else
497 EXPECT_EQ("kwalletd", service_name); 497 EXPECT_EQ("kwalletd", service_name);
498 EXPECT_TRUE(urls.empty()); 498 EXPECT_TRUE(urls.empty());
499 EXPECT_TRUE(envs.empty()); 499 EXPECT_TRUE(envs.empty());
500 EXPECT_TRUE(startup_id.empty()); 500 EXPECT_TRUE(startup_id.empty());
501 EXPECT_FALSE(blind); 501 EXPECT_FALSE(blind);
502 502
503 if (kwallet_runnable_) 503 if (kwallet_runnable_)
504 kwallet_running_ = true; 504 kwallet_running_ = true;
505 505
506 scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); 506 std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
507 dbus::MessageWriter writer(response.get()); 507 dbus::MessageWriter writer(response.get());
508 writer.AppendInt32(klauncher_ret_); 508 writer.AppendInt32(klauncher_ret_);
509 writer.AppendString(std::string()); // dbus_name 509 writer.AppendString(std::string()); // dbus_name
510 writer.AppendString(klauncher_error_); 510 writer.AppendString(klauncher_error_);
511 writer.AppendInt32(1234); // pid 511 writer.AppendInt32(1234); // pid
512 return response.release(); 512 return response.release();
513 } 513 }
514 514
515 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( 515 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall(
516 dbus::MethodCall* method_call, testing::Unused) { 516 dbus::MethodCall* method_call, testing::Unused) {
517 if (!kwallet_running_) 517 if (!kwallet_running_)
518 return nullptr; 518 return nullptr;
519 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); 519 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface());
520 520
521 if (ContainsKey(failing_methods_, method_call->GetMember())) 521 if (ContainsKey(failing_methods_, method_call->GetMember()))
522 return nullptr; 522 return nullptr;
523 scoped_ptr<dbus::Response> response; 523 std::unique_ptr<dbus::Response> response;
524 if (method_call->GetMember() == "isEnabled") { 524 if (method_call->GetMember() == "isEnabled") {
525 response = dbus::Response::CreateEmpty(); 525 response = dbus::Response::CreateEmpty();
526 dbus::MessageWriter writer(response.get()); 526 dbus::MessageWriter writer(response.get());
527 writer.AppendBool(kwallet_enabled_); 527 writer.AppendBool(kwallet_enabled_);
528 } else if (method_call->GetMember() == "networkWallet") { 528 } else if (method_call->GetMember() == "networkWallet") {
529 response = dbus::Response::CreateEmpty(); 529 response = dbus::Response::CreateEmpty();
530 dbus::MessageWriter writer(response.get()); 530 dbus::MessageWriter writer(response.get());
531 writer.AppendString("test_wallet"); // Should match |open| below. 531 writer.AppendString("test_wallet"); // Should match |open| below.
532 } else if (method_call->GetMember() == "open") { 532 } else if (method_call->GetMember() == "open") {
533 dbus::MessageReader reader(method_call); 533 dbus::MessageReader reader(method_call);
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 } 1384 }
1385 1385
1386 TEST_F(NativeBackendKWalletPickleTest, CheckVersion5Pickle) { 1386 TEST_F(NativeBackendKWalletPickleTest, CheckVersion5Pickle) {
1387 CheckVersion5Pickle(); 1387 CheckVersion5Pickle();
1388 } 1388 }
1389 1389
1390 TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) { 1390 TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) {
1391 CheckVersion6Pickle(false); 1391 CheckVersion6Pickle(false);
1392 CheckVersion6Pickle(true); 1392 CheckVersion6Pickle(true);
1393 } 1393 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698