| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 TemplateURLService* template_url_service = | 79 TemplateURLService* template_url_service = |
| 80 ios::TemplateURLServiceFactory::GetForBrowserState( | 80 ios::TemplateURLServiceFactory::GetForBrowserState( |
| 81 chrome_browser_state_.get()); | 81 chrome_browser_state_.get()); |
| 82 template_url_service->Load(); | 82 template_url_service->Load(); |
| 83 | 83 |
| 84 chrome_browser_state_->CreateBookmarkModel(true); | 84 chrome_browser_state_->CreateBookmarkModel(true); |
| 85 bookmarks::test::WaitForBookmarkModelToLoad( | 85 bookmarks::test::WaitForBookmarkModelToLoad( |
| 86 ios::BookmarkModelFactory::GetForBrowserState( | 86 ios::BookmarkModelFactory::GetForBrowserState( |
| 87 chrome_browser_state_.get())); | 87 chrome_browser_state_.get())); |
| 88 GURL url(kChromeUINewTabURL); | 88 GURL url(kChromeUINewTabURL); |
| 89 parentViewController_ = [[UIViewController alloc] init]; |
| 89 controller_ = | 90 controller_ = |
| 90 [[NewTabPageController alloc] initWithUrl:url | 91 [[NewTabPageController alloc] initWithUrl:url |
| 91 loader:nil | 92 loader:nil |
| 92 focuser:nil | 93 focuser:nil |
| 93 ntpObserver:nil | 94 ntpObserver:nil |
| 94 browserState:chrome_browser_state_.get() | 95 browserState:chrome_browser_state_.get() |
| 95 colorCache:nil | 96 colorCache:nil |
| 96 webToolbarDelegate:nil | 97 webToolbarDelegate:nil |
| 97 tabModel:nil]; | 98 tabModel:nil |
| 99 parentViewController:parentViewController_]; |
| 98 | 100 |
| 99 incognitoController_ = [[NewTabPageController alloc] | 101 incognitoController_ = [[NewTabPageController alloc] |
| 100 initWithUrl:url | 102 initWithUrl:url |
| 101 loader:nil | 103 loader:nil |
| 102 focuser:nil | 104 focuser:nil |
| 103 ntpObserver:nil | 105 ntpObserver:nil |
| 104 browserState:chrome_browser_state_ | 106 browserState:chrome_browser_state_ |
| 105 ->GetOffTheRecordChromeBrowserState() | 107 ->GetOffTheRecordChromeBrowserState() |
| 106 colorCache:nil | 108 colorCache:nil |
| 107 webToolbarDelegate:nil | 109 webToolbarDelegate:nil |
| 108 tabModel:nil]; | 110 tabModel:nil |
| 111 parentViewController:parentViewController_]; |
| 109 }; | 112 }; |
| 110 | 113 |
| 111 void TearDown() override { | 114 void TearDown() override { |
| 112 incognitoController_ = nil; | 115 incognitoController_ = nil; |
| 113 controller_ = nil; | 116 controller_ = nil; |
| 117 parentViewController_ = nil; |
| 114 | 118 |
| 115 // There may be blocks released below that have weak references to |profile| | 119 // There may be blocks released below that have weak references to |profile| |
| 116 // owned by chrome_browser_state_. Ensure BlockCleanupTest::TearDown() is | 120 // owned by chrome_browser_state_. Ensure BlockCleanupTest::TearDown() is |
| 117 // called before |chrome_browser_state_| is reset. | 121 // called before |chrome_browser_state_| is reset. |
| 118 BlockCleanupTest::TearDown(); | 122 BlockCleanupTest::TearDown(); |
| 119 chrome_browser_state_.reset(); | 123 chrome_browser_state_.reset(); |
| 120 } | 124 } |
| 121 | 125 |
| 122 web::TestWebThreadBundle thread_bundle_; | 126 web::TestWebThreadBundle thread_bundle_; |
| 123 IOSChromeScopedTestingLocalState local_state_; | 127 IOSChromeScopedTestingLocalState local_state_; |
| 124 std::unique_ptr<TestChromeBrowserState> chrome_browser_state_; | 128 std::unique_ptr<TestChromeBrowserState> chrome_browser_state_; |
| 129 UIViewController* parentViewController_; |
| 125 NewTabPageController* controller_; | 130 NewTabPageController* controller_; |
| 126 NewTabPageController* incognitoController_; | 131 NewTabPageController* incognitoController_; |
| 127 }; | 132 }; |
| 128 | 133 |
| 129 TEST_F(NewTabPageControllerTest, NewTabBarItemDidChange) { | 134 TEST_F(NewTabPageControllerTest, NewTabBarItemDidChange) { |
| 130 // Switching the selected index in the NewTabPageBar should cause | 135 // Switching the selected index in the NewTabPageBar should cause |
| 131 // newTabBarItemDidChange to get called. | 136 // newTabBarItemDidChange to get called. |
| 132 NewTabPageBar* bar = [[controller_ ntpView] tabBar]; | 137 NewTabPageBar* bar = [[controller_ ntpView] tabBar]; |
| 133 NSUInteger bookmarkIndex = 0; | 138 NSUInteger bookmarkIndex = 0; |
| 134 UIButton* button = [[bar buttons] objectAtIndex:bookmarkIndex]; | 139 UIButton* button = [[bar buttons] objectAtIndex:bookmarkIndex]; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 EXPECT_EQ("open_tabs", | 213 EXPECT_EQ("open_tabs", |
| 209 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); | 214 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); |
| 210 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); | 215 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); |
| 211 EXPECT_EQ(NewTabPage::kBookmarksPanel, | 216 EXPECT_EQ(NewTabPage::kBookmarksPanel, |
| 212 NewTabPage::IdentifierFromFragment("bookmarks")); | 217 NewTabPage::IdentifierFromFragment("bookmarks")); |
| 213 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); | 218 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); |
| 214 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); | 219 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); |
| 215 } | 220 } |
| 216 | 221 |
| 217 } // anonymous namespace | 222 } // anonymous namespace |
| OLD | NEW |