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

Unified Diff: ios/chrome/browser/sessions/session_window_unittest.mm

Issue 2687353003: Created SerializableUserDataManager. (Closed)
Patch Set: self review, added unittest 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
Index: ios/chrome/browser/sessions/session_window_unittest.mm
diff --git a/ios/chrome/browser/sessions/session_window_unittest.mm b/ios/chrome/browser/sessions/session_window_unittest.mm
index eb00a9d5811e9f03393c55ee4be49a24d3df281c..efe35c08e080b8f160767fb7c75bf24469d7360b 100644
--- a/ios/chrome/browser/sessions/session_window_unittest.mm
+++ b/ios/chrome/browser/sessions/session_window_unittest.mm
@@ -14,7 +14,7 @@
#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
#import "ios/chrome/browser/sessions/session_service.h"
#import "ios/web/navigation/crw_session_controller.h"
-#import "ios/web/public/crw_navigation_manager_storage.h"
+#import "ios/web/public/crw_session_storage.h"
#include "ios/web/public/test/test_web_thread_bundle.h"
#import "ios/web/public/web_state/web_state.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -66,10 +66,8 @@ void SetUp() override {
std::unique_ptr<WebStateImpl> webState2(CreateWebState(@"window2", nil, NO));
base::scoped_nsobject<SessionWindowIOS> sessionWindow(
[[SessionWindowIOS alloc] init]);
- [sessionWindow
- addSerializedSession:webState1->BuildSerializedNavigationManager()];
- [sessionWindow
- addSerializedSession:webState2->BuildSerializedNavigationManager()];
+ [sessionWindow addSerializedSession:webState1->BuildSessionStorage()];
+ [sessionWindow addSerializedSession:webState2->BuildSessionStorage()];
[sessionWindow setSelectedIndex:1];
EXPECT_TRUE(sessionWindow.get() != nil);
@@ -91,10 +89,8 @@ void SetUp() override {
std::unique_ptr<WebStateImpl> webState2(CreateWebState(windowName2, nil, NO));
NSString* openerId2 =
webState2->GetNavigationManagerImpl().GetSessionController().openerId;
- [sessionWindow
- addSerializedSession:webState1->BuildSerializedNavigationManager()];
- [sessionWindow
- addSerializedSession:webState2->BuildSerializedNavigationManager()];
+ [sessionWindow addSerializedSession:webState1->BuildSessionStorage()];
+ [sessionWindow addSerializedSession:webState2->BuildSessionStorage()];
[sessionWindow setSelectedIndex:1];
@@ -109,12 +105,12 @@ void SetUp() override {
EXPECT_EQ(unarchivedObj.selectedIndex, sessionWindow.get().selectedIndex);
NSArray* sessions = unarchivedObj.sessions;
ASSERT_EQ(2U, sessions.count);
- CRWNavigationManagerStorage* unarchivedSession1 = sessions[0];
+ CRWSessionStorage* unarchivedSession1 = sessions[0];
EXPECT_NSEQ(windowName1, unarchivedSession1.windowName);
EXPECT_NSEQ(openerId1, unarchivedSession1.openerID);
EXPECT_TRUE(unarchivedSession1.openedByDOM);
- CRWNavigationManagerStorage* unarchivedSession2 = sessions[1];
+ CRWSessionStorage* unarchivedSession2 = sessions[1];
EXPECT_NSEQ(windowName2, unarchivedSession2.windowName);
EXPECT_NSEQ(openerId2, unarchivedSession2.openerID);
EXPECT_FALSE(unarchivedSession2.openedByDOM);

Powered by Google App Engine
This is Rietveld 408576698