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

Unified Diff: ios/chrome/browser/ui/history/history_entry_inserter_unittest.mm

Issue 2650423002: [ObjC ARC] Converts ios/chrome/browser/ui/history:unit_tests to ARC. (Closed)
Patch Set: comments Created 3 years, 7 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/history/history_entry_inserter_unittest.mm
diff --git a/ios/chrome/browser/ui/history/history_entry_inserter_unittest.mm b/ios/chrome/browser/ui/history/history_entry_inserter_unittest.mm
index 35c49a82d1438e811c8234a1771bcd0f8c971b37..f85a6b370935a47239d7e4f4a2d85ebb907b1138 100644
--- a/ios/chrome/browser/ui/history/history_entry_inserter_unittest.mm
+++ b/ios/chrome/browser/ui/history/history_entry_inserter_unittest.mm
@@ -5,7 +5,6 @@
#import "ios/chrome/browser/ui/history/history_entry_inserter.h"
#import "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
@@ -17,34 +16,38 @@
#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
+
HistoryEntryItem* TestHistoryEntryItem(base::Time timestamp,
const std::string& name) {
history::HistoryEntry entry = history::HistoryEntry(
history::HistoryEntry::LOCAL_ENTRY, GURL(("http://" + name).c_str()),
base::UTF8ToUTF16(name.c_str()), timestamp, std::string(), false,
base::string16(), false);
- return [[[HistoryEntryItem alloc] initWithType:kItemTypeEnumZero
- historyEntry:entry
- browserState:nil
- delegate:nil] autorelease];
+ return [[HistoryEntryItem alloc] initWithType:kItemTypeEnumZero
+ historyEntry:entry
+ browserState:nil
+ delegate:nil];
}
// Test fixture for HistoryEntryInserter.
class HistoryEntryInserterTest : public PlatformTest {
public:
HistoryEntryInserterTest() {
- model_.reset([[CollectionViewModel alloc] init]);
+ model_ = [[CollectionViewModel alloc] init];
[model_ addSectionWithIdentifier:kSectionIdentifierEnumZero];
- inserter_.reset([[HistoryEntryInserter alloc] initWithModel:model_]);
- mock_delegate_.reset([[OCMockObject
- mockForProtocol:@protocol(HistoryEntryInserterDelegate)] retain]);
+ inserter_ = [[HistoryEntryInserter alloc] initWithModel:model_];
+ mock_delegate_ =
+ [OCMockObject mockForProtocol:@protocol(HistoryEntryInserterDelegate)];
[inserter_ setDelegate:mock_delegate_];
}
protected:
- base::scoped_nsobject<CollectionViewModel> model_;
- base::scoped_nsobject<HistoryEntryInserter> inserter_;
- base::scoped_nsprotocol<id<HistoryEntryInserterDelegate>> mock_delegate_;
+ __strong CollectionViewModel* model_;
+ __strong HistoryEntryInserter* inserter_;
+ __strong id<HistoryEntryInserterDelegate> mock_delegate_;
};
// Tests that history entry items added to CollectionViewModel are sorted by
@@ -58,7 +61,7 @@ TEST_F(HistoryEntryInserterTest, AddItems) {
HistoryEntryItem* entry3 =
TestHistoryEntryItem(today - 2 * (minute), "entry3");
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect] historyEntryInserter:inserter_
didInsertSectionAtIndex:1];
[[mock_delegate expect]
@@ -106,7 +109,7 @@ TEST_F(HistoryEntryInserterTest, AddSections) {
TestHistoryEntryItem(today - day - minute, "day2_entry2");
HistoryEntryItem* day3 = TestHistoryEntryItem(today - 2 * day, "day3");
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect] historyEntryInserter:inserter_
didInsertSectionAtIndex:1];
@@ -196,7 +199,7 @@ TEST_F(HistoryEntryInserterTest, AddDuplicateItems) {
HistoryEntryItem* entry1 = TestHistoryEntryItem(today, "entry");
HistoryEntryItem* entry2 = TestHistoryEntryItem(today, "entry");
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect] historyEntryInserter:inserter_
didInsertSectionAtIndex:1];
[[mock_delegate expect]
@@ -224,7 +227,7 @@ TEST_F(HistoryEntryInserterTest, RemoveSection) {
HistoryEntryItem* day1 = TestHistoryEntryItem(today, "day1");
HistoryEntryItem* day2 = TestHistoryEntryItem(today - day, "day2");
- OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_.get();
+ OCMockObject* mock_delegate = (OCMockObject*)mock_delegate_;
[[mock_delegate expect] historyEntryInserter:inserter_
didInsertSectionAtIndex:1];

Powered by Google App Engine
This is Rietveld 408576698