diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm index 0749f66..9f60ae1 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm @@ -78,7 +78,8 @@ class TestingToolbarModelDelegate : public ToolbarModelDelegate { class TestingOmniboxEditController : public OmniboxEditController { public: - TestingOmniboxEditController() {} + explicit TestingOmniboxEditController(ToolbarModel* toolbar_model) + : toolbar_model_(toolbar_model) {} virtual ~TestingOmniboxEditController() {} // Overridden from OmniboxEditController: @@ -97,8 +98,14 @@ class TestingOmniboxEditController : public OmniboxEditController { virtual content::WebContents* GetWebContents() const OVERRIDE { return NULL; } + virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; } + virtual const ToolbarModel* GetToolbarModel() const OVERRIDE { + return toolbar_model_; + } private: + ToolbarModel* toolbar_model_; + DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController); }; @@ -117,7 +124,7 @@ TEST_F(OmniboxViewMacTest, GetFieldFont) { TEST_F(OmniboxViewMacTest, TabToAutocomplete) { chrome::EnableInstantExtendedAPIForTesting(); - OmniboxViewMac view(NULL, NULL, profile(), NULL, NULL); + OmniboxViewMac view(NULL, profile(), NULL, NULL); // This is deleted by the omnibox view. MockOmniboxEditModel* model = @@ -149,9 +156,9 @@ TEST_F(OmniboxViewMacTest, SetGrayTextAutocompletion) { TestingToolbarModelDelegate delegate; ToolbarModelImpl toolbar_model(&delegate); - OmniboxViewMac view(NULL, &toolbar_model, profile(), NULL, field.get()); + TestingOmniboxEditController controller(&toolbar_model); + OmniboxViewMac view(&controller, profile(), NULL, field.get()); - TestingOmniboxEditController controller; // This is deleted by the omnibox view. MockOmniboxEditModel* model = new MockOmniboxEditModel(&view, &controller, profile()); @@ -172,7 +179,7 @@ TEST_F(OmniboxViewMacTest, SetGrayTextAutocompletion) { } TEST_F(OmniboxViewMacTest, UpDownArrow) { - OmniboxViewMac view(NULL, NULL, profile(), NULL, NULL); + OmniboxViewMac view(NULL, profile(), NULL, NULL); // This is deleted by the omnibox view. MockOmniboxEditModel* model = |