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

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

Issue 2654433007: [ios] Moves find-in-page code out of Tab and into FindTabHelper. (Closed)
Patch Set: Review. 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
« no previous file with comments | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/chrome/test/BUILD.gn » ('j') | no next file with comments »
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 30319d3cb7e22fdf78e73b176c1af149adbb1681..ca22cbc75a4208e1ff714661d80c3597ba6de8e2 100644
--- a/ios/chrome/browser/ui/browser_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/browser_view_controller_unittest.mm
@@ -25,8 +25,6 @@
#include "ios/chrome/browser/chrome_paths.h"
#include "ios/chrome/browser/chrome_switches.h"
#include "ios/chrome/browser/chrome_url_constants.h"
-#import "ios/chrome/browser/find_in_page/find_in_page_controller.h"
-#import "ios/chrome/browser/find_in_page/find_in_page_model.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/tabs/tab.h"
@@ -144,14 +142,12 @@ class BrowserViewControllerTest : public BlockCleanupTest {
chrome_browser_state_.get());
bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
- // Set up mock TabModel, Tab, CRWWebController and FindInPageController.
+ // Set up mock TabModel, Tab, and CRWWebController.
id tabModel = [OCMockObject mockForClass:[TabModel class]];
base::scoped_nsobject<id> currentTab([[BVCTestTabMock alloc]
initWithRepresentedObject:[OCMockObject niceMockForClass:[Tab class]]]);
id webControllerMock =
[OCMockObject niceMockForClass:[CRWWebController class]];
- id findInPageControllerMock =
- [OCMockObject niceMockForClass:[FindInPageController class]];
// Stub methods for TabModel.
NSUInteger tabCount = 1;
@@ -174,8 +170,6 @@ class BrowserViewControllerTest : public BlockCleanupTest {
UIView* dummyView = [[[UIView alloc] initWithFrame:CGRectZero] autorelease];
[[[currentTab stub] andReturn:dummyView] view];
[[[currentTab stub] andReturn:webControllerMock] webController];
- [[[currentTab stub] andReturn:findInPageControllerMock]
- findInPageController];
id sessionControllerMock =
[OCMockObject niceMockForClass:[CRWSessionController class]];
@@ -217,7 +211,6 @@ class BrowserViewControllerTest : public BlockCleanupTest {
[[[factory stub] andReturn:nil] showPassKitErrorInfoBarForManager:nil];
webController_.reset([webControllerMock retain]);
- findInPageController_.reset([findInPageControllerMock retain]);
tabModel_.reset([tabModel retain]);
tab_.reset([currentTab retain]);
dependencyFactory_.reset([factory retain]);
@@ -260,7 +253,6 @@ class BrowserViewControllerTest : public BlockCleanupTest {
base::scoped_nsobject<TabModel> tabModel_;
ToolbarModelIOS* toolbarModelIOS_;
base::scoped_nsprotocol<id<ShareProtocol>> shareController_;
- base::scoped_nsobject<FindInPageController> findInPageController_;
base::scoped_nsobject<PKAddPassesViewController> passKitViewController_;
base::scoped_nsobject<OCMockObject> dependencyFactory_;
base::scoped_nsobject<BrowserViewController> bvc_;
« no previous file with comments | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698