Use vector assets for media router icons.

chrome/browser/ui/toolbar/media_router_action_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/browser/ui/webui/media_router/media_router_test.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/test/test_utils.h"
 #include "grit/theme_resources.h"
 #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;
 
 class MockToolbarActionViewDelegate : public ToolbarActionViewDelegate {
  public:
   MockToolbarActionViewDelegate() {}
   ~MockToolbarActionViewDelegate() {}
 
   MOCK_CONST_METHOD0(GetCurrentWebContents, WebContents*());
@@ skipping 59 matching lines @@
             "title fatal",
             "message fatal",
             media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
             std::vector<media_router::IssueAction>(),
             "route_id",
             media_router::Issue::FATAL,
             true,
             -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 {}
 
   // MediaRouterTest:
   void SetUp() override {
     MediaRouterTest::SetUp();
     toolbar_model_ = extensions::extension_action_test_util::
         CreateToolbarModelForProfileWithoutWaitingForReady(profile());
 
     // browser() will only be valid once BrowserWithTestWindowTest::SetUp()
@@ skipping 231 matching lines @@
   // Pressing the icon while the popup is shown should close the popup
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   action()->ExecuteAction(true);
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
   dialog_controller_->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller_->HideMediaRouterDialog();
 }