Move more vector icons to more appropriate directories.

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 "chrome/browser/ui/toolbar/media_router_action.h"
 #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_web_ui_test.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/vector_icons/vector_icons.h"
 
 using content::WebContents;
 using media_router::MediaRouterDialogControllerImpl;
 
 class MockToolbarActionViewDelegate : public ToolbarActionViewDelegate {
  public:
   MockToolbarActionViewDelegate() {}
   ~MockToolbarActionViewDelegate() {}
 
   MOCK_CONST_METHOD0(GetCurrentWebContents, WebContents*());
@@ skipping 56 matching lines @@
         fake_issue_warning_(media_router::IssueInfo(
             "title warning",
             media_router::IssueInfo::Action::LEARN_MORE,
             media_router::IssueInfo::Severity::WARNING)),
         fake_issue_fatal_(
             media_router::IssueInfo("title fatal",
                                     media_router::IssueInfo::Action::DISMISS,
                                     media_router::IssueInfo::Severity::FATAL)),
         fake_source1_("fakeSource1"),
         fake_source2_("fakeSource2"),
-        active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)),
-        error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)),
-        idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)),
-        warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {}
+        active_icon_(GetIcon(ui::kMediaRouterActiveIcon)),
+        error_icon_(GetIcon(ui::kMediaRouterErrorIcon)),
+        idle_icon_(GetIcon(ui::kMediaRouterIdleIcon)),
+        warning_icon_(GetIcon(ui::kMediaRouterWarningIcon)) {}
 
   ~MediaRouterActionUnitTest() override {}
 
   // MediaRouterWebUITest:
   void SetUp() override {
     MediaRouterWebUITest::SetUp();
     toolbar_model_ =
         extensions::extension_action_test_util::CreateToolbarModelForProfile(
             profile());
 
@@ skipping 16 matching lines @@
         media_router::MediaRoute("routeId3", fake_source2_, "sinkId3",
                                  "description", true, std::string(), false));
   }
 
   void TearDown() override {
     action_.reset();
     browser_action_test_util_.reset();
     MediaRouterWebUITest::TearDown();
   }
 
-  gfx::Image GetIcon(gfx::VectorIconId icon_id) {
-    return gfx::Image(gfx::CreateVectorIcon(
-        icon_id, MediaRouterAction::GetIconColor(icon_id)));
+  gfx::Image GetIcon(const gfx::VectorIcon& icon) {
+    return gfx::Image(
+        gfx::CreateVectorIcon(icon, MediaRouterAction::GetIconColor(icon)));
   }
 
   TestMediaRouterAction* action() { return action_.get(); }
   const media_router::Issue& fake_issue_notification() {
     return fake_issue_notification_;
   }
   const media_router::Issue& fake_issue_warning() {
     return fake_issue_warning_;
   }
   const media_router::Issue& fake_issue_fatal() { return fake_issue_fatal_; }
@@ skipping 194 matching lines @@
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   action()->ExecuteAction(true);
   EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
   dialog_controller->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller->HideMediaRouterDialog();
 }