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

Unified Diff: ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm

Issue 2688703004: [ObjC ARC] Converts ios/chrome/browser/ui/promos:unit_tests to ARC. (Closed)
Patch Set: Created 3 years, 10 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 | « ios/chrome/browser/ui/promos/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm b/ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm
index 417d8d1dcb818288e8d39e17e083dfd6a693c157..29b10c116d6cfa4e008996ad8ec2bbe7a7bd3f2f 100644
--- a/ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/promos/signin_promo_view_controller_unittest.mm
@@ -6,7 +6,6 @@
#include <memory>
-#import "base/mac/scoped_nsobject.h"
#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/version.h"
@@ -25,6 +24,10 @@
#import "third_party/ocmock/OCMock/OCMock.h"
#import "third_party/ocmock/gtest_support.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface SigninPromoViewController (ExposedForTesting)
@property(nonatomic, readonly) UIView* accountsContainer;
- (void)recordPromoDisplayed;
@@ -71,7 +74,7 @@ class SigninPromoViewControllerTest : public BlockCleanupTest {
public:
~SigninPromoViewControllerTest() override {}
- SigninPromoViewController* controller() { return controller_.get(); }
+ SigninPromoViewController* controller() { return controller_; }
void SetUp() override {
BlockCleanupTest::SetUp();
@@ -84,8 +87,8 @@ class SigninPromoViewControllerTest : public BlockCleanupTest {
chrome_browser_state_ = builder.Build();
ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
->AddIdentities(@[ @"foo", @"bar" ]);
- controller_.reset([[FakeVersionSigninPromoViewController alloc]
- initWithBrowserState:chrome_browser_state_.get()]);
+ controller_ = [[FakeVersionSigninPromoViewController alloc]
+ initWithBrowserState:chrome_browser_state_.get()];
}
void TearDown() override {
@@ -117,7 +120,7 @@ class SigninPromoViewControllerTest : public BlockCleanupTest {
protected:
web::TestWebThreadBundle thread_bundle_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
- base::scoped_nsobject<SigninPromoViewController> controller_;
+ SigninPromoViewController* controller_;
};
TEST_F(SigninPromoViewControllerTest, TestConstructorDestructor) {
« no previous file with comments | « ios/chrome/browser/ui/promos/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698