Plugins: Remove obsolete check in PepperWebPluginImpl.

content/renderer/pepper/pepper_webplugin_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/pepper/pepper_webplugin_impl.h"
 
 #include <stddef.h>
 #include <cmath>
 #include <utility>
 
@@ skipping 49 matching lines @@
 
 PepperWebPluginImpl::PepperWebPluginImpl(
     PluginModule* plugin_module,
     const WebPluginParams& params,
     RenderFrameImpl* render_frame,
     std::unique_ptr<PluginInstanceThrottlerImpl> throttler)
     : init_data_(new InitData()),
       full_frame_(params.loadManually),
       throttler_(std::move(throttler)),
       instance_object_(PP_MakeUndefined()),
-      container_(nullptr),
-      destroyed_(false) {
+      container_(nullptr) {
   DCHECK(plugin_module);
   init_data_->module = plugin_module;
   init_data_->render_frame = render_frame;
   for (size_t i = 0; i < params.attributeNames.size(); ++i) {
     init_data_->arg_names.push_back(params.attributeNames[i].utf8());
     init_data_->arg_values.push_back(params.attributeValues[i].utf8());
   }
   init_data_->url = params.url;
 
   // Set subresource URL for crash reporting.
@@ skipping 22 matching lines @@
     return false;
 
   if (!instance_->Initialize(init_data_->arg_names, init_data_->arg_values,
                              full_frame_, std::move(throttler_))) {
     // If |container_| is nullptr, this object has already been synchronously
     // destroy()-ed during |instance_|'s Initialize call. In that case, we early
     // exit. We neither create a replacement plugin nor destroy() ourselves.
     if (!container_)
       return false;
 
-    DCHECK(!destroyed_);
-
     DCHECK(instance_);
     ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
     instance_object_ = PP_MakeUndefined();
     instance_->Delete();
     instance_ = nullptr;
 
     blink::WebPlugin* replacement_plugin =
         GetContentClient()->renderer()->CreatePluginReplacement(
             init_data_->render_frame, init_data_->module->path());
     if (!replacement_plugin)
@@ skipping 11 matching lines @@
     destroy();
 
     return true;
   }
 
   init_data_.reset();
   return true;
 }
 
 void PepperWebPluginImpl::destroy() {
-  // TODO(tommycli): Remove once we fix https://crbug.com/588624.
-  CHECK(!destroyed_);
-  destroyed_ = true;
-
   container_ = nullptr;
 
   if (instance_) {
     ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
     instance_object_ = PP_MakeUndefined();
     instance_->Delete();
     instance_ = nullptr;
   }
 
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
@@ skipping 139 matching lines @@
 
 bool PepperWebPluginImpl::canRotateView() { return instance_->CanRotateView(); }
 
 void PepperWebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
 bool PepperWebPluginImpl::isPlaceholder() { return false; }
 
 }  // namespace content