Convert --enable-md-history to a feature flag.

chrome/browser/ui/webui/uber/uber_ui_browsertest.cc

Index: chrome/browser/ui/webui/uber/uber_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui_browsertest.cc b/chrome/browser/ui/webui/uber/uber_ui_browsertest.cc
index 14bc2c7f76d4da911f79f644d36dfbb40d222bc2..f7d691f5dd7a6fbcdb078be5f296ed554a2ccb52 100644
--- a/chrome/browser/ui/webui/uber/uber_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/web_ui_browser_test.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
@@ -92,8 +93,12 @@ IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdExtensionsHidesExtensions) {
 }
 
 IN_PROC_BROWSER_TEST_F(UberUIBrowserTest, EnableMdHistoryHidesHistory) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-    ::switches::kEnableMaterialDesignHistory);
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);

[tsergeant, 2016/03/10 05:23:35]

This bit looks good to me.

+  feature_list->InitializeFromCommandLine(
+      ::switches::kMaterialDesignHistoryFeature.name, "");
+  base::FeatureList::ClearInstanceForTesting();
+  base::FeatureList::SetInstance(std::move(feature_list));
+
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIUberFrameURL));
   SelectTab();
   EXPECT_TRUE(GetJsBool("$('history').hidden"));