Let --js-flags work when Harmony is enabled in about:flags

R=jochen@chromium.org
BUG=

Review URL: https://codereview.chromium.org/588543003

Cr-Commit-Position: refs/heads/master@{#295960}

chrome/browser/about_flags.cc

@@ -806,7 +806,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME,
     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony")
+    SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)
   },
   {
     "disable-software-rasterizer",

chrome/browser/chrome_content_browser_client.cc

@@ -1359,6 +1359,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kEnableShowModalDialog,
       switches::kEnableStreamlinedHostedApps,
       switches::kEnableWebBasedSignin,
+      switches::kJavaScriptHarmony,
       switches::kMessageLoopHistogrammer,
       switches::kOutOfProcessPdf,
       switches::kPlaybackMode,

chrome/common/chrome_switches.cc

@@ -759,6 +759,9 @@ const char kInstantProcess[]                = "instant-process";
 // enabled.
 const char kInvalidationUseGCMChannel[]     = "invalidation-use-gcm-channel";
 
+// Enables experimental Harmony (ECMAScript 6) features.
+const char kJavaScriptHarmony[]             = "javascript-harmony";
+
 // Specifies the testcase used by the IPC fuzzer.
 const char kIpcFuzzerTestcase[]             = "ipc-fuzzer-testcase";
 

chrome/common/chrome_switches.h

@@ -215,6 +215,7 @@ extern const char kInstallFromWebstore[];
 extern const char kInstantProcess[];
 extern const char kInvalidationUseGCMChannel[];
 extern const char kIpcFuzzerTestcase[];
+extern const char kJavaScriptHarmony[];
 extern const char kKeepAliveForTest[];
 extern const char kKioskMode[];
 extern const char kKioskModePrinting[];

chrome/renderer/chrome_render_process_observer.cc

@@ -264,6 +264,11 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver(
   if (command_line.HasSwitch(switches::kEnableShowModalDialog))
     WebRuntimeFeatures::enableShowModalDialog(true);
 
+  if (command_line.HasSwitch(switches::kJavaScriptHarmony)) {
+    std::string flag("--harmony");
+    v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size()));
+  }
+
   RenderThread* thread = RenderThread::Get();
   resource_delegate_.reset(new RendererResourceDelegate());
   thread->SetResourceDispatcherDelegate(resource_delegate_.get());