OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" | 5 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 browserState:chrome_browser_state_.get()]; | 95 browserState:chrome_browser_state_.get()]; |
96 controller_ = | 96 controller_ = |
97 [[NewTabPageController alloc] initWithUrl:url | 97 [[NewTabPageController alloc] initWithUrl:url |
98 loader:nil | 98 loader:nil |
99 focuser:nil | 99 focuser:nil |
100 ntpObserver:nil | 100 ntpObserver:nil |
101 browserState:chrome_browser_state_.get() | 101 browserState:chrome_browser_state_.get() |
102 colorCache:nil | 102 colorCache:nil |
103 webToolbarDelegate:nil | 103 webToolbarDelegate:nil |
104 tabModel:tabModel_ | 104 tabModel:tabModel_ |
105 parentViewController:parentViewController_]; | 105 parentViewController:parentViewController_ |
| 106 dispatcher:nil]; |
106 | 107 |
107 incognitoController_ = [[NewTabPageController alloc] | 108 incognitoController_ = [[NewTabPageController alloc] |
108 initWithUrl:url | 109 initWithUrl:url |
109 loader:nil | 110 loader:nil |
110 focuser:nil | 111 focuser:nil |
111 ntpObserver:nil | 112 ntpObserver:nil |
112 browserState:chrome_browser_state_ | 113 browserState:chrome_browser_state_ |
113 ->GetOffTheRecordChromeBrowserState() | 114 ->GetOffTheRecordChromeBrowserState() |
114 colorCache:nil | 115 colorCache:nil |
115 webToolbarDelegate:nil | 116 webToolbarDelegate:nil |
116 tabModel:nil | 117 tabModel:nil |
117 parentViewController:parentViewController_]; | 118 parentViewController:parentViewController_ |
| 119 dispatcher:nil]; |
118 }; | 120 }; |
119 | 121 |
120 void TearDown() override { | 122 void TearDown() override { |
121 incognitoController_ = nil; | 123 incognitoController_ = nil; |
122 controller_ = nil; | 124 controller_ = nil; |
123 parentViewController_ = nil; | 125 parentViewController_ = nil; |
124 [tabModel_ browserStateDestroyed]; | 126 [tabModel_ browserStateDestroyed]; |
125 tabModel_ = nil; | 127 tabModel_ = nil; |
126 | 128 |
127 // There may be blocks released below that have weak references to |profile| | 129 // There may be blocks released below that have weak references to |profile| |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 EXPECT_EQ("open_tabs", | 224 EXPECT_EQ("open_tabs", |
223 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); | 225 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); |
224 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); | 226 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); |
225 EXPECT_EQ(NewTabPage::kBookmarksPanel, | 227 EXPECT_EQ(NewTabPage::kBookmarksPanel, |
226 NewTabPage::IdentifierFromFragment("bookmarks")); | 228 NewTabPage::IdentifierFromFragment("bookmarks")); |
227 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); | 229 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); |
228 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); | 230 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); |
229 } | 231 } |
230 | 232 |
231 } // anonymous namespace | 233 } // anonymous namespace |
OLD | NEW |