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

Unified Diff: ios/chrome/browser/passwords/credential_manager_unittest.mm

Issue 2559693003: [ObjC ARC] Converts ios/chrome/browser/passwords:unit_tests to ARC. (Closed)
Patch Set: Cleanup Created 4 years 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: ios/chrome/browser/passwords/credential_manager_unittest.mm
diff --git a/ios/chrome/browser/passwords/credential_manager_unittest.mm b/ios/chrome/browser/passwords/credential_manager_unittest.mm
index a66d5246893300cd421c43d4ed4e74ea0d8d1460..da6a3d078d48eb1fd4d11acd36f27eb1236132ee 100644
--- a/ios/chrome/browser/passwords/credential_manager_unittest.mm
+++ b/ios/chrome/browser/passwords/credential_manager_unittest.mm
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "base/mac/bind_objc_block.h"
#include "base/memory/ref_counted.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -31,6 +30,10 @@
#include "third_party/ocmock/gtest_support.h"
#include "url/gurl.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using testing::Return;
namespace {
@@ -105,9 +108,9 @@ typedef BOOL (^StringPredicate)(NSString*);
// Returns a block that takes a string argument and returns whether it is equal
// to |string|.
StringPredicate EqualsString(const char* string) {
- return [[^BOOL(NSString* other) {
+ return [^BOOL(NSString* other) {
return [base::SysUTF8ToNSString(string) isEqualToString:other];
- } copy] autorelease];
+ } copy];
}
// A stub PasswordManagerClient for testing.
@@ -191,11 +194,11 @@ class CredentialManagerTest : public web::WebTestWithWebState {
web::WebTestWithWebState::SetUp();
id originalMock =
[OCMockObject niceMockForClass:[JSCredentialManager class]];
- mock_js_credential_manager_.reset([[MockJSCredentialManager alloc]
- initWithRepresentedObject:originalMock]);
- credential_manager_.reset(new CredentialManager(
- web_state(), &stub_client_, &stub_driver_,
- static_cast<id>(mock_js_credential_manager_.get())));
+ mock_js_credential_manager_ = [[MockJSCredentialManager alloc]
+ initWithRepresentedObject:originalMock];
+ credential_manager_.reset(
+ new CredentialManager(web_state(), &stub_client_, &stub_driver_,
+ static_cast<id>(mock_js_credential_manager_)));
LoadHtml(@"", GURL(kTestURL));
}
@@ -263,7 +266,7 @@ class CredentialManagerTest : public web::WebTestWithWebState {
password_manager::StubPasswordManagerDriver stub_driver_;
// Mock for JSCredentialManager.
- base::scoped_nsobject<MockJSCredentialManager> mock_js_credential_manager_;
+ MockJSCredentialManager* mock_js_credential_manager_;
// CredentialManager for testing.
std::unique_ptr<CredentialManager> credential_manager_;

Powered by Google App Engine
This is Rietveld 408576698