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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2740233002: Remove CRWSessionController usage from BrowserViewController. (Closed)
Patch Set: Created 3 years, 9 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
« ios/chrome/browser/ui/browser_view_controller.mm ('K') | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/web/navigation/navigation_manager_impl.h » ('j') | ios/web/public/navigation_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/browser_view_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller_unittest.mm b/ios/chrome/browser/ui/browser_view_controller_unittest.mm
index 45354be1be2d842ad436d25859b97fe9657a4c9b..25937b9317d874952bf58b200c58999f0fb34a83 100644
--- a/ios/chrome/browser/ui/browser_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/browser_view_controller_unittest.mm
@@ -49,7 +49,6 @@
#include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
#include "ios/chrome/test/testing_application_context.h"
#import "ios/testing/ocmock_complex_type_helper.h"
-#import "ios/web/navigation/crw_session_controller.h"
#include "ios/web/public/referrer.h"
#include "ios/web/public/test/test_web_thread_bundle.h"
#import "ios/web/public/web_state/ui/crw_native_content_provider.h"
@@ -171,13 +170,10 @@ void SetUp() override {
[[[currentTab stub] andReturn:dummyView] view];
[[[currentTab stub] andReturn:webControllerMock] webController];
- id sessionControllerMock =
- [OCMockObject niceMockForClass:[CRWSessionController class]];
webStateImpl_.reset(new WebStateImpl(chrome_browser_state_.get()));
[currentTab setWebState:webStateImpl_.get()];
webStateImpl_->SetWebController(webControllerMock);
- webStateImpl_->GetNavigationManagerImpl().SetSessionController(
- sessionControllerMock);
+ webStateImpl_->GetNavigationManagerImpl().InitializeSession(false);
Eugene But (OOO till 7-30) 2017/03/10 16:23:27 nit: webStateImpl_->GetNavigationManagerImpl().Ini
kkhorimoto 2017/03/10 23:02:19 Done.
kkhorimoto 2017/03/10 23:02:19 Done.
// Set up mock ShareController.
id shareController =
« ios/chrome/browser/ui/browser_view_controller.mm ('K') | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/web/navigation/navigation_manager_impl.h » ('j') | ios/web/public/navigation_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698