Replace the struct workaround for forward-declaring ChromeViewHostMsg_GetPluginInfo_Status with a p…

chrome/renderer/plugins/chrome_plugin_placeholder.cc

 // Copyright 2013 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/plugins/chrome_plugin_placeholder.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/prerender_messages.h"
@@ skipping 46 matching lines @@
     content::RenderFrame* render_frame,
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params,
     const std::string& html_data,
     const base::string16& title)
     : plugins::LoadablePluginPlaceholder(render_frame,
                                          frame,
                                          params,
                                          html_data,
                                          GURL(kPluginPlaceholderDataURL)),
-      status_(new ChromeViewHostMsg_GetPluginInfo_Status),
+      status_(ChromeViewHostMsg_GetPluginInfo_Status::kAllowed),
       title_(title),
 #if defined(ENABLE_PLUGIN_INSTALLATION)
       placeholder_routing_id_(MSG_ROUTING_NONE),
 #endif
       has_host_(false),
       context_menu_request_id_(0) {
   RenderThread::Get()->AddObserver(this);
 }
 
 ChromePluginPlaceholder::~ChromePluginPlaceholder() {
@@ skipping 101 matching lines @@
 #if defined(ENABLE_PLUGINS)
   if (!poster_info.poster_attribute.empty())
     blocked_plugin->BlockForPowerSaverPoster();
 #endif
   blocked_plugin->SetPluginInfo(info);
   blocked_plugin->SetIdentifier(identifier);
   return blocked_plugin;
 }
 
 void ChromePluginPlaceholder::SetStatus(
-    const ChromeViewHostMsg_GetPluginInfo_Status& status) {
-  status_->value = status.value;
+    ChromeViewHostMsg_GetPluginInfo_Status status) {
+  status_ = status;
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 int32 ChromePluginPlaceholder::CreateRoutingId() {
   placeholder_routing_id_ = RenderThread::Get()->GenerateRoutingID();
   RenderThread::Get()->AddRoute(placeholder_routing_id_, this);
   return placeholder_routing_id_;
 }
 #endif
 
@@ skipping 34 matching lines @@
       new ChromeViewHostMsg_OpenAboutPlugins(routing_id()));
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 void ChromePluginPlaceholder::OnDidNotFindMissingPlugin() {
   SetMessage(l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_FOUND));
 }
 
 void ChromePluginPlaceholder::OnFoundMissingPlugin(
     const base::string16& plugin_name) {
-  if (status_->value == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound)
+  if (status_ == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound)
     SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_FOUND, plugin_name));
   has_host_ = true;
   plugin_name_ = plugin_name;
 }
 
 void ChromePluginPlaceholder::OnStartedDownloadingPlugin() {
   SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING, plugin_name_));
 }
 
 void ChromePluginPlaceholder::OnFinishedDownloadingPlugin() {
   bool is_installing =
-      status_->value == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
+      status_ == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound;
   SetMessage(l10n_util::GetStringFUTF16(
       is_installing ? IDS_PLUGIN_INSTALLING : IDS_PLUGIN_UPDATING,
       plugin_name_));
 }
 
 void ChromePluginPlaceholder::OnErrorDownloadingPlugin(
     const std::string& error) {
   SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_ERROR,
                                         base::UTF8ToUTF16(error)));
 }
@@ skipping 12 matching lines @@
     return;
 
   ChromeViewHostMsg_GetPluginInfo_Output output;
   std::string mime_type(GetPluginParams().mimeType.utf8());
   render_frame()->Send(
       new ChromeViewHostMsg_GetPluginInfo(routing_id(),
                                           GURL(GetPluginParams().url),
                                           document.url(),
                                           mime_type,
                                           &output));
-  if (output.status.value == status_->value)
+  if (output.status == status_)
     return;
   WebPlugin* new_plugin = ChromeContentRendererClient::CreatePlugin(
       render_frame(),  GetFrame(), GetPluginParams(), output);
   ReplacePlugin(new_plugin);
   if (!new_plugin) {
     PluginUMAReporter::GetInstance()->ReportPluginMissing(
         GetPluginParams().mimeType.utf8(), GURL(GetPluginParams().url));
   }
 }
 
@@ skipping 76 matching lines @@
   v8::Handle<v8::Object> global = context->Global();
   global->Set(gin::StringToV8(isolate, "plugin"),
               gin::CreateHandle(isolate, this).ToV8());
 }
 
 gin::ObjectTemplateBuilder ChromePluginPlaceholder::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
   return LoadablePluginPlaceholder::GetObjectTemplateBuilder(isolate).SetMethod(
       "openAboutPlugins", &ChromePluginPlaceholder::OpenAboutPluginsCallback);
 }