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

Unified Diff: ios/chrome/browser/ui/native_content_controller_unittest.mm

Issue 2936833002: [ObjC ARC] Converts ios/chrome/browser/ui:unit_tests to ARC. (Closed)
Patch Set: Fix bad ARC guard. Created 3 years, 6 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: ios/chrome/browser/ui/native_content_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/native_content_controller_unittest.mm b/ios/chrome/browser/ui/native_content_controller_unittest.mm
index 707c0fdfa4dcabc773715fa0b78600f5496d50a4..e581f25ace84d1ce10825cf4cab2b72edd525807 100644
--- a/ios/chrome/browser/ui/native_content_controller_unittest.mm
+++ b/ios/chrome/browser/ui/native_content_controller_unittest.mm
@@ -3,43 +3,46 @@
// found in the LICENSE file.
#include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/native_content_controller.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
TEST(NativeContentControllerTest, TestInitWithURL) {
GURL url("http://foo.bar.com");
- base::scoped_nsobject<NativeContentController> controller(
- [[NativeContentController alloc] initWithURL:url]);
- EXPECT_EQ(url, controller.get().url);
+ NativeContentController* controller =
+ [[NativeContentController alloc] initWithURL:url];
+ EXPECT_EQ(url, controller.url);
// There is no default view without a nib.
- EXPECT_EQ(nil, controller.get().view);
+ EXPECT_EQ(nil, controller.view);
}
TEST(NativeContentControllerTest, TestInitWithEmptyNibNameAndURL) {
GURL url("http://foo.bar.com");
- base::scoped_nsobject<NativeContentController> controller(
- [[NativeContentController alloc] initWithNibName:nil url:url]);
- EXPECT_EQ(url, controller.get().url);
+ NativeContentController* controller =
+ [[NativeContentController alloc] initWithNibName:nil url:url];
+ EXPECT_EQ(url, controller.url);
// There is no default view without a nib.
- EXPECT_EQ(nil, controller.get().view);
+ EXPECT_EQ(nil, controller.view);
}
TEST(NativeContentControllerTest, TestInitWithNibAndURL) {
GURL url("http://foo.bar.com");
NSString* nibName = @"native_content_controller_test";
- base::scoped_nsobject<NativeContentController> controller(
- [[NativeContentController alloc] initWithNibName:nibName url:url]);
- EXPECT_EQ(url, controller.get().url);
+ NativeContentController* controller =
+ [[NativeContentController alloc] initWithNibName:nibName url:url];
+ EXPECT_EQ(url, controller.url);
// Check that view is loaded from nib.
- EXPECT_NE(nil, controller.get().view);
- UIView* view = controller.get().view;
+ EXPECT_NE(nil, controller.view);
+ UIView* view = controller.view;
EXPECT_EQ(1u, view.subviews.count);
EXPECT_NE(nil, [view.subviews firstObject]);
UILabel* label = [view.subviews firstObject];

Powered by Google App Engine
This is Rietveld 408576698