Index: chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
index 1239e8dcf4816ab4cb96fd82c6d5a5e3bf698307..9220fa050bdd3e74600229d5c028c517d82c7f3a 100644 |
--- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
+++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc |
@@ -477,7 +477,7 @@ dbus::Response* NativeBackendKWalletTest::KLauncherMethodCall( |
dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( |
dbus::MethodCall* method_call, testing::Unused) { |
if (!kwallet_running_) |
- return NULL; |
+ return nullptr; |
EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); |
if (ContainsKey(failing_methods_, method_call->GetMember())) |
@@ -574,7 +574,7 @@ dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( |
int handle = NativeBackendKWalletStub::kInvalidKWalletHandle; |
std::string folder_name; |
std::string key; |
- const uint8_t* bytes = NULL; |
+ const uint8_t* bytes = nullptr; |
size_t length = 0; |
std::string app_name; |
EXPECT_TRUE(reader.PopInt32(&handle)); |
@@ -590,7 +590,7 @@ dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( |
TestKWallet::Blob(bytes, length)) ? 0 : 1); |
} |
- EXPECT_FALSE(response.get() == NULL); |
+ EXPECT_FALSE(response.get() == nullptr); |
vabr (Chromium)
2015/02/24 11:40:14
EXPECT_TRUE(response);
Pritam Nikam
2015/02/24 12:28:51
Done.
|
return response.release(); |
} |