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

Unified Diff: ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm

Issue 2835033002: Revert of Replace TabModel with WebStateList in GoogleLandingController. (Closed)
Patch Set: Created 3 years, 8 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/ntp/new_tab_page_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm b/ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm
index 0c54bfe52ac90faa51448bd2db84da3eca89c54e..1bae95d9b5999e01111a27afa9635afb917b419a 100644
--- a/ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm
@@ -17,8 +17,6 @@
#include "ios/chrome/browser/chrome_url_constants.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h"
-#import "ios/chrome/browser/sessions/test_session_service.h"
-#import "ios/chrome/browser/tabs/tab_model.h"
#import "ios/chrome/browser/ui/ntp/new_tab_page_view.h"
#include "ios/chrome/browser/ui/ui_util.h"
#include "ios/chrome/test/block_cleanup_test.h"
@@ -89,10 +87,6 @@
chrome_browser_state_.get()));
GURL url(kChromeUINewTabURL);
parentViewController_ = [[UIViewController alloc] init];
- tabModel_ = [[TabModel alloc]
- initWithSessionWindow:nil
- sessionService:[[TestSessionService alloc] init]
- browserState:chrome_browser_state_.get()];
controller_ =
[[NewTabPageController alloc] initWithUrl:url
loader:nil
@@ -101,7 +95,7 @@
browserState:chrome_browser_state_.get()
colorCache:nil
webToolbarDelegate:nil
- tabModel:tabModel_
+ tabModel:nil
parentViewController:parentViewController_];
incognitoController_ = [[NewTabPageController alloc]
@@ -121,8 +115,6 @@
incognitoController_ = nil;
controller_ = nil;
parentViewController_ = nil;
- [tabModel_ browserStateDestroyed];
- tabModel_ = nil;
// There may be blocks released below that have weak references to |profile|
// owned by chrome_browser_state_. Ensure BlockCleanupTest::TearDown() is
@@ -134,7 +126,6 @@
web::TestWebThreadBundle thread_bundle_;
IOSChromeScopedTestingLocalState local_state_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
- TabModel* tabModel_;
UIViewController* parentViewController_;
NewTabPageController* controller_;
NewTabPageController* incognitoController_;
« no previous file with comments | « ios/chrome/browser/ui/ntp/new_tab_page_controller.mm ('k') | ios/chrome/browser/ui/ntp/new_tab_page_header_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698