Chromium Code Reviews| Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc |
| diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc |
| index 1542cf386c87a9baf00fdb096173381f1de61e81..68a84e17eb1e9de03d1af232b18104efe873af2e 100644 |
| --- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc |
| +++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc |
| @@ -18,7 +18,9 @@ |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/base/resource/resource_bundle.h" |
|
apacible
2016/07/13 22:30:19
Same -- can we remove this?
|
| +#include "ui/gfx/color_palette.h" |
| #include "ui/gfx/image/image_unittest_util.h" |
| +#include "ui/gfx/paint_vector_icon.h" |
| using content::WebContents; |
| using media_router::MediaRouterDialogControllerImpl; |
| @@ -98,14 +100,16 @@ class MediaRouterActionUnitTest : public MediaRouterTest { |
| -1)), |
| fake_source1_("fakeSource1"), |
| fake_source2_("fakeSource2"), |
| - active_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| - IDR_MEDIA_ROUTER_ACTIVE_ICON)), |
| - error_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| - IDR_MEDIA_ROUTER_ERROR_ICON)), |
| - idle_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| - IDR_MEDIA_ROUTER_IDLE_ICON)), |
| - warning_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| - IDR_MEDIA_ROUTER_WARNING_ICON)) {} |
| + active_icon_( |
| + gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE, |
| + gfx::kPlaceholderColor)), |
| + error_icon_(gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR, |
| + gfx::kPlaceholderColor)), |
| + idle_icon_(gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE, |
| + gfx::kPlaceholderColor)), |
| + warning_icon_( |
| + gfx::CreateVectorIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING, |
| + gfx::kPlaceholderColor)) {} |
| ~MediaRouterActionUnitTest() override {} |