Revert of Plugin Power Saver: Improve Poster behavior for essential plugins.

components/plugins/renderer/loadable_plugin_placeholder.cc

 // Copyright 2015 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 "components/plugins/renderer/loadable_plugin_placeholder.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
@@ skipping 252 matching lines @@
 
 void LoadablePluginPlaceholder::DidFinishLoadingCallback() {
   finished_loading_ = true;
   if (message_.length() > 0)
     UpdateMessage();
 
   // Wait for the placeholder to finish loading to hide the premade plugin.
   // This is necessary to prevent a flicker.
   if (premade_throttler_ && power_saver_enabled_)
     premade_throttler_->SetHiddenForPlaceholder(true /* hidden */);
-
-  // In case our initial geometry was reported before the placeholder finished
-  // loading, request another one. Needed for correct large poster unthrottling.
-  plugin()->container()->reportGeometry();
 }
 
 void LoadablePluginPlaceholder::DidFinishIconRepositionForTestingCallback() {
   // Set an attribute and post an event, so browser tests can wait for the
   // placeholder to be ready to receive simulated user input.
   blink::WebElement element = plugin()->container()->element();
   element.setAttribute("placeholderReady", "true");
 
   scoped_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
@@ skipping 57 matching lines @@
     int x = roundf(unobscured_rect_.x() / zoom_factor);
     int y = roundf(unobscured_rect_.y() / zoom_factor);
     std::string script = base::StringPrintf(
         "window.resizePoster('%dpx', '%dpx', '%dpx', '%dpx')", x, y, width,
         height);
     plugin()->web_view()->mainFrame()->executeScript(
         blink::WebScriptSource(base::UTF8ToUTF16(script)));
 
     // On a size update check if we now qualify as a essential plugin.
     url::Origin content_origin = url::Origin(GetPluginParams().url);
-    auto status = render_frame()->GetPeripheralContentStatus(
-        render_frame()->GetWebFrame()->top()->securityOrigin(), content_origin,
-        gfx::Size(width, height));
-    if (status != content::RenderFrame::CONTENT_STATUS_PERIPHERAL) {
+    bool cross_origin_main_content = false;
+    if (!render_frame()->ShouldThrottleContent(
+            render_frame()->GetWebFrame()->top()->securityOrigin(),
+            content_origin, width, height, &cross_origin_main_content)) {
       MarkPluginEssential(
           heuristic_run_before_
               ? PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_SIZE_CHANGE
               : PluginInstanceThrottler::UNTHROTTLE_METHOD_DO_NOT_RECORD);
 
-      if (!heuristic_run_before_ &&
-          status ==
-              content::RenderFrame::CONTENT_STATUS_ESSENTIAL_CROSS_ORIGIN_BIG) {
+      if (cross_origin_main_content && !heuristic_run_before_)
         render_frame()->WhitelistContentOrigin(content_origin);
-      }
     }
 
     heuristic_run_before_ = true;
   }
 }
 
 }  // namespace plugins