Use empty resource identifier unless --enable-resource-content-settings is set.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 249 matching lines @@
   if (!found)
     return NULL;
   if (!webkit::npapi::IsPluginEnabled(info))
     return NULL;
 
   const webkit::npapi::PluginGroup* group =
       webkit::npapi::PluginList::Singleton()->GetPluginGroup(info);
   DCHECK(group != NULL);
 
   ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
-  std::string resource = group->identifier();
+  std::string resource;
+  if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
+    resource = group->identifier();
   render_view->Send(new ViewHostMsg_GetPluginContentSetting(
       frame->top()->url(), resource, &plugin_setting));
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
   WebPluginParams params(original_params);
   for (size_t i = 0; i < info.mime_types.size(); ++i) {
     if (info.mime_types[i].mime_type == actual_mime_type) {
       AppendParams(info.mime_types[i].additional_param_names,
                    info.mime_types[i].additional_param_values,
                    &params.attributeNames,
@@ skipping 62 matching lines @@
         return render_view->CreatePepperPlugin(
             frame, params, info.path, pepper_module.get());
       }
       return NULL;
     }
 
     return render_view->CreateNPAPIPlugin(
         frame, params, info.path, actual_mime_type);
   }
 
-  observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS,
-      cmd->HasSwitch(switches::kEnableResourceContentSettings) ?
-          resource : std::string());
+  observer->DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
   if (plugin_setting == CONTENT_SETTING_ASK) {
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML,
         IDS_PLUGIN_LOAD, false, true);
   } else {
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
         IDS_PLUGIN_BLOCKED, false, true);
   }
 }
@@ skipping 208 matching lines @@
   if (old_url == new_url) {
     bool is_extension_url = !!extensions->GetByURL(new_url);
     if (is_extension_url != extension_dispatcher_->is_extension_process())
       return true;
   }
 
   return !extensions->InSameExtent(old_url, new_url);
 }
 
 }  // namespace chrome