Chromium Code Reviews| Index: chrome/browser/ui/views/menu_item_view_interactive_uitest.cc |
| =================================================================== |
| --- chrome/browser/ui/views/menu_item_view_interactive_uitest.cc (revision 257128) |
| +++ chrome/browser/ui/views/menu_item_view_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" |
| @@ -21,6 +22,12 @@ |
| virtual ~MenuItemViewTestBasic() { |
| } |
| + virtual void SetUp() OVERRIDE { |
| + ChromeUnitTestSuite::InitializeProviders(); |
|
sky
2014/03/14 21:35:56
You have this in MenuTestBase, so presumably you d
jam
2014/03/14 22:35:40
oh, i didn't have it before, but now i do. so i'll
|
| + ChromeUnitTestSuite::InitializeResourceBundle(); |
| + MenuTestBase::SetUp(); |
| + } |
| + |
| // MenuTestBase implementation |
| virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
| menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); |
| @@ -71,6 +78,12 @@ |
| virtual ~MenuItemViewTestInsert() { |
| } |
| + virtual void SetUp() OVERRIDE { |
| + ChromeUnitTestSuite::InitializeProviders(); |
| + ChromeUnitTestSuite::InitializeResourceBundle(); |
| + MenuTestBase::SetUp(); |
| + } |
| + |
| // MenuTestBase implementation |
| virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
| menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); |
| @@ -153,6 +166,12 @@ |
| virtual ~MenuItemViewTestInsertWithSubmenu() { |
| } |
| + virtual void SetUp() OVERRIDE { |
| + ChromeUnitTestSuite::InitializeProviders(); |
| + ChromeUnitTestSuite::InitializeResourceBundle(); |
| + MenuTestBase::SetUp(); |
| + } |
| + |
| // MenuTestBase implementation |
| virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
| submenu_ = menu->AppendSubMenu(1, ASCIIToUTF16("My Submenu")); |
| @@ -212,6 +231,12 @@ |
| virtual ~MenuItemViewTestRemove() { |
| } |
| + virtual void SetUp() OVERRIDE { |
| + ChromeUnitTestSuite::InitializeProviders(); |
| + ChromeUnitTestSuite::InitializeResourceBundle(); |
| + MenuTestBase::SetUp(); |
| + } |
| + |
| // MenuTestBase implementation |
| virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
| menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); |
| @@ -278,6 +303,12 @@ |
| virtual ~MenuItemViewTestRemoveWithSubmenu() { |
| } |
| + virtual void SetUp() OVERRIDE { |
| + ChromeUnitTestSuite::InitializeProviders(); |
| + ChromeUnitTestSuite::InitializeResourceBundle(); |
| + MenuTestBase::SetUp(); |
| + } |
| + |
| // MenuTestBase implementation |
| virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
| menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1")); |