[Media Router] Add experiment control logic.

chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
index cdde653df7a195b7c119a0dc811fb29a3eab1c9f..ad2454a421be75f45f83c9573427c5d8d45db106 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -13,6 +13,9 @@
 #include "chrome/common/chrome_switches.h"
 #include "extensions/common/feature_switch.h"
 
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/router/media_router_feature.h"
+#endif

[msw, 2015/10/23 20:18:43]

nit: blank line after

[imcheng, 2015/10/23 21:39:26]

Done.

 namespace {
 
 ComponentToolbarActionsFactory* testing_factory_ = nullptr;
@@ -43,8 +46,10 @@ std::set<std::string> ComponentToolbarActionsFactory::GetComponentIds(
   if (!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
     return component_ids;
 
-  if (switches::MediaRouterEnabled() && !profile->IsOffTheRecord())
+#if defined(ENABLE_MEDIA_ROUTER)
+  if (media_router::MediaRouterEnabled() && !profile->IsOffTheRecord())
     component_ids.insert(kMediaRouterActionId);
+#endif  // defined(ENABLE_MEDIA_ROUTER)
 
   return component_ids;
 }