[Media Router] Adds a contextual menu item to remove the MR component action.

chrome/browser/ui/toolbar/media_router_contextual_menu.cc

Index: chrome/browser/ui/toolbar/media_router_contextual_menu.cc
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
index 4d649f04bdd2eed08ee4b1e67686368dc255d020..1ff2ac43144c46ba7e420f288fbfc742ca889bc8 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
@@ -5,12 +5,16 @@
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/extensions/component_migration_helper.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+#include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -26,6 +30,8 @@ MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
                                   IDS_MEDIA_ROUTER_LEARN_MORE);
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_HELP,
                                   IDS_MEDIA_ROUTER_HELP);
+  menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION,
+                                  IDS_EXTENSIONS_UNINSTALL);
   menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE,
                                   IDS_MEDIA_ROUTER_REPORT_ISSUE);
@@ -58,6 +64,9 @@ base::string16 MediaRouterContextualMenu::GetLabelForCommandId(
     case IDC_MEDIA_ROUTER_HELP:
       string_id = IDS_MEDIA_ROUTER_HELP;
       break;
+    case IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION:
+      string_id = IDS_EXTENSIONS_UNINSTALL;
+      break;
     case IDC_MEDIA_ROUTER_LEARN_MORE:
       string_id = IDS_MEDIA_ROUTER_LEARN_MORE;
       break;
@@ -93,6 +102,9 @@ void MediaRouterContextualMenu::ExecuteCommand(int command_id,
     case IDC_MEDIA_ROUTER_LEARN_MORE:
       chrome::ShowSingletonTab(browser_, GURL(kCastLearnMorePageUrl));
       break;
+    case IDC_MEDIA_ROUTER_REMOVE_TOOLBAR_ACTION:
+      RemoveMediaRouterComponentAction();
+      break;
     case IDC_MEDIA_ROUTER_REPORT_ISSUE:
       ReportIssue();
       break;
@@ -116,3 +128,11 @@ void MediaRouterContextualMenu::ReportIssue() {
                            "/feedback.html");
   chrome::ShowSingletonTab(browser_, GURL(feedback_url));
 }
+
+void MediaRouterContextualMenu::RemoveMediaRouterComponentAction() {
+  extensions::ComponentMigrationHelper* const component_migration_helper =
+      ToolbarActionsModel::Get(browser_->profile())
+          ->component_migration_helper();
+  component_migration_helper->OnActionRemoved(

[Peter Kasting, 2016/01/26 02:12:35]

Nit: I'd probably just inline:

  ToolbarActionsModel::Get(browser_->profile())->component_migration_helper()
      ->OnActionRemoved(ComponentToolbarActionsFactory::kMediaRouterActionId);

This seems more readable to me.

[mark a. foltz, 2016/01/29 00:37:44]

Done

+      ComponentToolbarActionsFactory::kMediaRouterActionId);
+}