Revert 186011
> Disable threaded HTML parser
> 
> This CL disables the threaded HTML parser so that we don't promote it to the
> Dev channel. Once the Dev channel build is cut, we'll revert this CL to enable
> the threaded parser for Canary again.
> 
> TBR=darin
> 
> Review URL: https://chromiumcodereview.appspot.com/12391067

The Dev channel build has been cut. We're going to send this feature to Canary
again.

[email protected]
Review URL: https://codereview.chromium.org/12457006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186210 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f3212ade..7ebe3c2 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -510,7 +510,8 @@
       command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
   prefs.css_grid_layout_enabled =
       command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
-  prefs.threaded_html_parser = false;
+  prefs.threaded_html_parser =
+      !command_line.HasSwitch(switches::kDisableThreadedHTMLParser);
 #if defined(OS_ANDROID)
   prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(
       switches::kDisableGestureRequirementForMediaPlayback);