<browser> Make new implementation the default.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 289 matching lines @@
 std::string ChromeContentRendererClient::GetDefaultEncoding() {
   return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING);
 }
 
 bool ChromeContentRendererClient::OverrideCreatePlugin(
     content::RenderView* render_view,
     WebFrame* frame,
     const WebPluginParams& params,
     WebPlugin** plugin) {
   std::string orig_mime_type = params.mimeType.utf8();
-  if (orig_mime_type == content::kBrowserPluginNewMimeType ||
-      ((orig_mime_type == content::kBrowserPluginMimeType) &&
+  if (orig_mime_type == content::kBrowserPluginMimeType) {
+    bool browser_plugin_old_impl = CommandLine::ForCurrentProcess()->HasSwitch(
+       switches::kEnableBrowserPluginOldImplementation);
+    if (!browser_plugin_old_impl) {
+      // TODO(lazyboy): Restrict new path to apps as well?

[Mihai Parparita -not on Chrome, 2012/10/03 22:44:00]

Please do.

[lazyboy, 2012/10/03 23:26:57]

Done.
Also the other TODO below should be covered by the TODO in render_view_impl.cc,
therefore removed.

I will be adding another command line flag that enables browser plugin on
regular pages as well so we can use that for development.

+      return false;
+    } else if (browser_plugin_old_impl &&
         extensions::ExtensionHelper::Get(render_view)->view_type() ==
-        VIEW_TYPE_APP_SHELL)) {
+            VIEW_TYPE_APP_SHELL) {
+      // TODO(fsamuel): Remove this once upstreaming of the new browser plugin
+      // is complete.
       return false;
+    }
   }
 
   ChromeViewHostMsg_GetPluginInfo_Output output;
   render_view->Send(new ChromeViewHostMsg_GetPluginInfo(
       render_view->GetRoutingID(), GURL(params.url),
       frame->top()->document().url(), orig_mime_type, &output));
   *plugin = CreatePlugin(render_view, frame, params, output);
   return true;
 }
 
@@ skipping 633 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome