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

Side by Side Diff: chrome/browser/ui/views/menu_model_adapter_test.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: cleanup Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "base/callback.h" 5 #include "base/callback.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/test/base/chrome_unit_test_suite.h"
7 #include "chrome/test/base/interactive_test_utils.h" 8 #include "chrome/test/base/interactive_test_utils.h"
8 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
9 #include "chrome/test/base/view_event_test_base.h" 10 #include "chrome/test/base/view_event_test_base.h"
10 #include "ui/base/models/menu_model.h" 11 #include "ui/base/models/menu_model.h"
11 #include "ui/base/test/ui_controls.h" 12 #include "ui/base/test/ui_controls.h"
12 #include "ui/views/controls/button/menu_button.h" 13 #include "ui/views/controls/button/menu_button.h"
13 #include "ui/views/controls/button/menu_button_listener.h" 14 #include "ui/views/controls/button/menu_button_listener.h"
14 #include "ui/views/controls/menu/menu_controller.h" 15 #include "ui/views/controls/menu/menu_controller.h"
15 #include "ui/views/controls/menu/menu_item_view.h" 16 #include "ui/views/controls/menu/menu_item_view.h"
16 #include "ui/views/controls/menu/menu_model_adapter.h" 17 #include "ui/views/controls/menu/menu_model_adapter.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 views::ViewsDelegate::views_delegate = &views_delegate_; 200 views::ViewsDelegate::views_delegate = &views_delegate_;
200 } 201 }
201 202
202 virtual ~MenuModelAdapterTest() { 203 virtual ~MenuModelAdapterTest() {
203 views::ViewsDelegate::views_delegate = old_views_delegate_; 204 views::ViewsDelegate::views_delegate = old_views_delegate_;
204 } 205 }
205 206
206 // ViewEventTestBase implementation. 207 // ViewEventTestBase implementation.
207 208
208 virtual void SetUp() OVERRIDE { 209 virtual void SetUp() OVERRIDE {
210 ChromeUnitTestSuite::InitializeProviders();
211 ChromeUnitTestSuite::InitializeResourceBundle();
212
209 button_ = new views::MenuButton( 213 button_ = new views::MenuButton(
210 NULL, base::ASCIIToUTF16("Menu Adapter Test"), this, true); 214 NULL, base::ASCIIToUTF16("Menu Adapter Test"), this, true);
211 215
212 menu_ = menu_model_adapter_.CreateMenu(); 216 menu_ = menu_model_adapter_.CreateMenu();
213 menu_runner_.reset(new views::MenuRunner(menu_)); 217 menu_runner_.reset(new views::MenuRunner(menu_));
214 218
215 ViewEventTestBase::SetUp(); 219 ViewEventTestBase::SetUp();
216 } 220 }
217 221
218 virtual void TearDown() OVERRIDE { 222 virtual void TearDown() OVERRIDE {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 views::TestViewsDelegate views_delegate_; 315 views::TestViewsDelegate views_delegate_;
312 316
313 views::MenuButton* button_; 317 views::MenuButton* button_;
314 TopMenuModel top_menu_model_; 318 TopMenuModel top_menu_model_;
315 views::MenuModelAdapter menu_model_adapter_; 319 views::MenuModelAdapter menu_model_adapter_;
316 views::MenuItemView* menu_; 320 views::MenuItemView* menu_;
317 scoped_ptr<views::MenuRunner> menu_runner_; 321 scoped_ptr<views::MenuRunner> menu_runner_;
318 }; 322 };
319 323
320 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) 324 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698