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

Unified Diff: ios/web/navigation/crw_session_storage_unittest.mm

Issue 2935983002: [ObjC ARC] Converts ios/web:ios_web_navigation_unittests to ARC. (Closed)
Patch Set: 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/web/navigation/crw_session_storage_unittest.mm
diff --git a/ios/web/navigation/crw_session_storage_unittest.mm b/ios/web/navigation/crw_session_storage_unittest.mm
index c8a698df41c955962393f245c80469bc06c88a2b..3ade2103349b615c2d521cfa690ac70ed96342bb 100644
--- a/ios/web/navigation/crw_session_storage_unittest.mm
+++ b/ios/web/navigation/crw_session_storage_unittest.mm
@@ -4,7 +4,6 @@
#import "ios/web/public/crw_session_storage.h"
-#import "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#import "ios/web/navigation/navigation_item_impl.h"
#import "ios/web/navigation/navigation_item_storage_test_util.h"
@@ -18,6 +17,10 @@
#include "third_party/ocmock/gtest_support.h"
#include "ui/base/page_transition_types.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
// Checks for equality between the item storages in |items1| and |items2|.
BOOL ItemStorageListsAreEqual(NSArray* items1, NSArray* items2) {
@@ -64,8 +67,8 @@ class CRWNSessionStorageTest : public PlatformTest {
[session_storage_ setLastCommittedItemIndex:4];
[session_storage_ setPreviousItemIndex:3];
// Create an item storage.
- base::scoped_nsobject<CRWNavigationItemStorage> item_storage(
- [[CRWNavigationItemStorage alloc] init]);
+ CRWNavigationItemStorage* item_storage =
+ [[CRWNavigationItemStorage alloc] init];
[item_storage setVirtualURL:GURL("http://init.test")];
[item_storage setReferrer:web::Referrer(GURL("http://referrer.url"),
web::ReferrerPolicyDefault)];
@@ -85,7 +88,7 @@ class CRWNSessionStorageTest : public PlatformTest {
}
protected:
- base::scoped_nsobject<CRWSessionStorage> session_storage_;
+ CRWSessionStorage* session_storage_;
};
// Tests that unarchiving CRWSessionStorage data results in an equivalent
« no previous file with comments | « ios/web/navigation/crw_session_controller_unittest.mm ('k') | ios/web/navigation/navigation_item_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698