<browser> Make new implementation the default.

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2462 matching lines @@
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
                                         const WebPluginParams& params) {
   WebPlugin* plugin = NULL;
   if (content::GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
-  // TODO(fsamuel): Remove this once upstreaming of the new browser plugin is
-  // complete.
-  if (UTF16ToASCII(params.mimeType) == content::kBrowserPluginNewMimeType) {
-   return content::BrowserPluginManager::Get()->
-      CreateBrowserPlugin(this, frame, params);
+  const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  if (UTF16ToASCII(params.mimeType) == content::kBrowserPluginMimeType) {
+    if (cmd_line->HasSwitch(switches::kEnableBrowserPluginOldImplementation)) {
+      // TODO(fsamuel): Remove this once upstreaming of the new browser plugin
+      // is complete.
+      return content::old::BrowserPlugin::Create(this, frame, params);
+    } else {
+      return content::BrowserPluginManager::Get()->CreateBrowserPlugin(this,
+                                                                       frame,
+                                                                       params);
+    }
   }
 
-  if (UTF16ToASCII(params.mimeType) == content::kBrowserPluginMimeType)
-    return content::old::BrowserPlugin::Create(this, frame, params);
-
   webkit::WebPluginInfo info;
   std::string mime_type;
   bool found = GetPluginInfo(params.url, frame->top()->document().url(),
                              params.mimeType.utf8(), &info, &mime_type);
   if (!found)
     return NULL;
 
   WebPluginParams params_to_use = params;
   params_to_use.mimeType = WebString::fromUTF8(mime_type);
   return CreatePlugin(frame, info, params_to_use);
@@ skipping 3810 matching lines @@
 
   updating_frame_tree_ = true;
   active_frame_id_map_.clear();
 
   target_process_id_ = process_id;
   target_routing_id_ = route_id;
   CreateFrameTree(webview()->mainFrame(), frames);
 
   updating_frame_tree_ = false;
 }