[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..b981b3a9240e5eee056958c3d6e60ecccd3a27cc 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -6,13 +6,17 @@
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/common/chrome_switches.h"

[msw, 2015/10/29 18:41:13]

nit: remove?

[imcheng, 2015/10/29 21:44:56]

Done.

 #include "extensions/common/feature_switch.h"
 
+#if defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/ui/toolbar/media_router_action.h"
+#endif
+
 namespace {
 
 ComponentToolbarActionsFactory* testing_factory_ = nullptr;
@@ -43,7 +47,7 @@ std::set<std::string> ComponentToolbarActionsFactory::GetComponentIds(
   if (!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
     return component_ids;
 
-  if (switches::MediaRouterEnabled() && !profile->IsOffTheRecord())
+  if (media_router::MediaRouterEnabled() && !profile->IsOffTheRecord())
     component_ids.insert(kMediaRouterActionId);
 
   return component_ids;
@@ -64,9 +68,11 @@ ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
   // (since each will have an action in the toolbar or overflow menu), this
   // should be okay. If this changes, we should rethink this design to have,
   // e.g., RegisterChromeAction().
+#if defined(ENABLE_MEDIA_ROUTER)
   if (id == kMediaRouterActionId)
     return scoped_ptr<ToolbarActionViewController>(
         new MediaRouterAction(browser));
+#endif  // defined(ENABLE_MEDIA_ROUTER)
 
   NOTREACHED();
   return scoped_ptr<ToolbarActionViewController>();