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

Unified Diff: chrome/browser/ui/views/menu_controller_interactive_uitest.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/menu_controller_interactive_uitest.cc
===================================================================
--- chrome/browser/ui/views/menu_controller_interactive_uitest.cc (revision 257128)
+++ chrome/browser/ui/views/menu_controller_interactive_uitest.cc (working copy)
@@ -4,6 +4,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/views/menu_test_base.h"
+#include "chrome/test/base/chrome_unit_test_suite.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/submenu_view.h"
@@ -16,6 +17,12 @@
virtual ~MenuControllerMnemonicTest() {
}
+ virtual void SetUp() OVERRIDE {
+ ChromeUnitTestSuite::InitializeProviders();
sky 2014/03/14 21:35:56 How about promoting this to view_event_test_base?
jam 2014/03/14 22:35:40 good idea, done. i didn't realize that this specif
+ ChromeUnitTestSuite::InitializeResourceBundle();
+ MenuTestBase::SetUp();
+ }
+
// MenuTestBase overrides:
virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE {
ASSERT_NE(ui::VKEY_DIVIDE, '/');

Powered by Google App Engine
This is Rietveld 408576698