[asm.js] [wasm] Move asm->wasm + WebAssembly switches to features.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 40983ad3533f595caebcc312ebaf11080f888dac..22cc454d176c23a07b589088564ed19b64640206 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -792,10 +792,10 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)},
     {"enable-asm-webassembly", IDS_FLAGS_ENABLE_ASM_WASM_NAME,
      IDS_FLAGS_ENABLE_ASM_WASM_DESCRIPTION, kOsAll,
-     SINGLE_VALUE_TYPE(switches::kEnableAsmWasm)},
+     FEATURE_VALUE_TYPE(features::kAsmJsToWebAssembly)},
     {"enable-webassembly", IDS_FLAGS_ENABLE_WASM_NAME,
      IDS_FLAGS_ENABLE_WASM_DESCRIPTION, kOsAll,
-     SINGLE_VALUE_TYPE(switches::kEnableWasm)},
+     FEATURE_VALUE_TYPE(features::kWebAssembly)},
     {"enable-ignition", IDS_FLAGS_V8_IGNITION_NAME,
      IDS_FLAGS_V8_IGNITION_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kV8Ignition)},