[6] Moves CreateVersionFromString to plugin_utils and updates the callers.

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"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/plugin_installer.h"

[ibraaaa, 2012/08/21 17:27:12]

Presubmit checks won't pass because of this include, there is a '-chrome' in
include rules, do we remove it?

[Bernhard Bauer, 2012/08/21 19:14:52]

The issue isn't chrome, it's that you're depending on chrome/browser, which is
code that's only supposed to run in the browser process, but this is the
renderer process. 

To get the information from the browser process to the renderer process, you're
going to have to add an IPC message; see ChromeViewHostMsg_Foo for examples.

 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/external_ipc_fuzzer.h"
@@ skipping 356 matching lines @@
 #if defined(ENABLE_MOBILE_YOUTUBE_PLUGIN)
     if (PluginPlaceholder::IsYouTubeURL(url, orig_mime_type))
       return PluginPlaceholder::CreateMobileYoutubePlugin(render_view, frame,
           original_params)->plugin();
 #endif
     MissingPluginReporter::GetInstance()->ReportPluginMissing(
         orig_mime_type, url);
     placeholder = PluginPlaceholder::CreateMissingPlugin(
         render_view, frame, original_params);
   } else {
-    scoped_ptr<webkit::npapi::PluginGroup> group(
-        webkit::npapi::PluginList::Singleton()->GetPluginGroup(plugin));
-    string16 name = group->GetGroupName();
+    string16 name = PluginInstaller::GetGroupName(plugin);
 
     // TODO(bauerb): This should be in content/.
     WebPluginParams params(original_params);
     for (size_t i = 0; i < plugin.mime_types.size(); ++i) {
       if (plugin.mime_types[i].mime_type == actual_mime_type) {
         AppendParams(plugin.mime_types[i].additional_param_names,
                      plugin.mime_types[i].additional_param_values,
                      &params.attributeNames,
                      &params.attributeValues);
         break;
@@ skipping 10 matching lines @@
     ContentSettingsObserver* observer =
         ContentSettingsObserver::Get(render_view);
 
     bool is_nacl_plugin =
         plugin.name ==
             ASCIIToUTF16(chrome::ChromeContentClient::kNaClPluginName);
     ContentSettingsType content_type =
         is_nacl_plugin ? CONTENT_SETTINGS_TYPE_JAVASCRIPT :
                          CONTENT_SETTINGS_TYPE_PLUGINS;
 
+    std::string identifier = PluginInstaller::GetIdentifier(plugin);
     if ((status_value ==
              ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized ||
          status_value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay ||
          status_value == ChromeViewHostMsg_GetPluginInfo_Status::kBlocked) &&
-        observer->IsPluginTemporarilyAllowed(group->identifier())) {
+        observer->IsPluginTemporarilyAllowed(identifier)) {
       status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
     }
 
     // Allow full-page plug-ins for click-to-play.
     if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay &&
         !frame->parent() &&
         !frame->opener() &&
         frame->document().isPluginDocument()) {
       status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
     }
@@ skipping 34 matching lines @@
                              is_extension_unrestricted,
                              is_extension_from_webstore,
                              &params)) {
             frame->addMessageToConsole(
                 WebConsoleMessage(
                     WebConsoleMessage::LevelError,
                     "Only unpacked extensions and apps installed from the "
                     "Chrome Web Store can load NaCl modules without enabling "
                     "Native Client in about:flags."));
             placeholder = PluginPlaceholder::CreateBlockedPlugin(
-                render_view, frame, params, plugin, group->identifier(), name,
+                render_view, frame, params, plugin, identifier, name,
                 IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_BLOCKED);
             break;
           }
         }
 
         // Delay loading plugins if prerendering.
         // TODO(mmenke):  In the case of prerendering, feed into
         //                ChromeContentRendererClient::CreatePlugin instead, to
         //                reduce the chance of future regressions.
         if (prerender::PrerenderHelper::IsPrerendering(render_view)) {
           placeholder = PluginPlaceholder::CreateBlockedPlugin(
-              render_view, frame, params, plugin, group->identifier(), name,
+              render_view, frame, params, plugin, identifier, name,
               IDR_CLICK_TO_PLAY_PLUGIN_HTML, IDS_PLUGIN_LOAD);
           placeholder->set_blocked_for_prerendering(true);
           placeholder->set_allow_loading(true);
           break;
         }
 
         return render_view->CreatePlugin(frame, plugin, params);
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kDisabled: {
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_DISABLED_PLUGIN_HTML, IDS_PLUGIN_DISABLED);
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedBlocked: {
 #if defined(ENABLE_PLUGIN_INSTALLATION)
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_OUTDATED);
         placeholder->set_allow_loading(true);
         render_view->Send(new ChromeViewHostMsg_BlockedOutdatedPlugin(
             render_view->GetRoutingID(), placeholder->CreateRoutingId(),
-            group->identifier()));
+            identifier));
 #else
         NOTREACHED();
 #endif
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kOutdatedDisallowed: {
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_OUTDATED);
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized: {
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_NOT_AUTHORIZED);
         placeholder->set_allow_loading(true);
         render_view->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin(
-            render_view->GetRoutingID(),
-            group->GetGroupName(),
-            group->identifier()));
+            render_view->GetRoutingID(), name, identifier));
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: {
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_CLICK_TO_PLAY_PLUGIN_HTML, IDS_PLUGIN_LOAD);
         placeholder->set_allow_loading(true);
         RenderThread::Get()->RecordUserMetrics("Plugin_ClickToPlay");
-        observer->DidBlockContentType(content_type, group->identifier());
+        observer->DidBlockContentType(content_type, identifier);
         break;
       }
       case ChromeViewHostMsg_GetPluginInfo_Status::kBlocked: {
         placeholder = PluginPlaceholder::CreateBlockedPlugin(
-            render_view, frame, params, plugin, group->identifier(), name,
+            render_view, frame, params, plugin, identifier, name,
             IDR_BLOCKED_PLUGIN_HTML, IDS_PLUGIN_BLOCKED);
         placeholder->set_allow_loading(true);
         RenderThread::Get()->RecordUserMetrics("Plugin_Blocked");
-        observer->DidBlockContentType(content_type, group->identifier());
+        observer->DidBlockContentType(content_type, identifier);
         break;
       }
     }
   }
   placeholder->SetStatus(status);
   return placeholder->plugin();
 }
 
 // For NaCl content handling plugins, the NaCl manifest is stored in an
 // additonal 'nacl' param associated with the MIME type.
@@ skipping 383 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome