Chromium Code Reviews| Index: ios/web/navigation/crw_session_entry_unittest.mm |
| diff --git a/ios/web/navigation/crw_session_entry_unittest.mm b/ios/web/navigation/crw_session_entry_unittest.mm |
| index ded434a0912b3a4318eb7686031742df4d692098..aae10d0d65f376f7e3bab5fb9d5fffa01adb08f2 100644 |
| --- a/ios/web/navigation/crw_session_entry_unittest.mm |
| +++ b/ios/web/navigation/crw_session_entry_unittest.mm |
| @@ -40,13 +40,12 @@ void SetUp() override { |
| item->SetTransitionType(transition); |
| item->SetTimestamp(base::Time::Now()); |
| item->SetPostData([@"Test data" dataUsingEncoding:NSUTF8StringEncoding]); |
| - sessionEntry_.reset( |
| + _sessionEntry.reset( |
| [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]); |
| } |
| - void TearDown() override { sessionEntry_.reset(); } |
| protected: |
| - base::scoped_nsobject<CRWSessionEntry> sessionEntry_; |
| + base::scoped_nsobject<CRWSessionEntry> _sessionEntry; |
|
Eugene But (OOO till 7-30)
2017/02/03 23:33:33
If you want to fix this ivar then it should be ses
kkhorimoto
2017/02/04 02:45:30
Done.
|
| }; |
| void CRWSessionEntryTest::expectEqualSessionEntries( |
| @@ -74,33 +73,25 @@ void SetUp() override { |
| } |
| TEST_F(CRWSessionEntryTest, Description) { |
| - [sessionEntry_ navigationItem]->SetTitle(base::SysNSStringToUTF16(@"Title")); |
| - EXPECT_NSEQ([sessionEntry_ description], |
| + [_sessionEntry navigationItem]->SetTitle(base::SysNSStringToUTF16(@"Title")); |
| + EXPECT_NSEQ([_sessionEntry description], |
| @"url:http://init.test/ originalurl:http://init.test/ " |
| @"title:Title transition:2 displayState:{ scrollOffset:(nan, " |
| @"nan), zoomScaleRange:(nan, nan), zoomScale:nan } desktopUA:0"); |
| } |
| -TEST_F(CRWSessionEntryTest, CopyWithZone) { |
| - CRWSessionEntry* sessionEntry2 = [sessionEntry_ copy]; |
| - EXPECT_NE(sessionEntry_, sessionEntry2); |
| - expectEqualSessionEntries( |
| - sessionEntry_, sessionEntry2, |
| - [sessionEntry_ navigationItem]->GetTransitionType()); |
| -} |
| - |
| TEST_F(CRWSessionEntryTest, EmptyVirtualUrl) { |
| EXPECT_EQ(GURL("http://init.test/"), |
| - [sessionEntry_ navigationItem]->GetURL()); |
| + [_sessionEntry navigationItem]->GetURL()); |
| } |
| TEST_F(CRWSessionEntryTest, NonEmptyVirtualUrl) { |
| - web::NavigationItem* item = [sessionEntry_ navigationItem]; |
| + web::NavigationItem* item = [_sessionEntry navigationItem]; |
| item->SetVirtualURL(GURL("http://user.friendly")); |
| EXPECT_EQ(GURL("http://user.friendly/"), item->GetVirtualURL()); |
| EXPECT_EQ(GURL("http://init.test/"), item->GetURL()); |
| } |
| TEST_F(CRWSessionEntryTest, EmptyDescription) { |
| - EXPECT_GT([[sessionEntry_ description] length], 0U); |
| + EXPECT_GT([[_sessionEntry description] length], 0U); |
| } |