Remove rendundant WebLocalFrame parameter in various plugin code.

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebMouseWheelEvent.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTouchEvent.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebElement.h"
-#include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebPluginParams.h"
 #include "public/web/WebPrintParams.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/tests/FakeWebPlugin.h"
 #include "web/tests/FrameTestHelpers.h"
@@ skipping 31 matching lines @@
 
  protected:
   std::string base_url_;
 };
 
 namespace {
 
 template <typename T>
 class CustomPluginWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
-  WebPlugin* CreatePlugin(WebLocalFrame* frame,
-                          const WebPluginParams& params) override {
-    return new T(frame, params);
+  WebPlugin* CreatePlugin(const WebPluginParams& params) override {
+    return new T(params);
   }
 };
 
 class TestPluginWebFrameClient;
 
 // Subclass of FakeWebPlugin that has a selection of 'x' as plain text and 'y'
 // as markup text.
 class TestPlugin : public FakeWebPlugin {
  public:
-  TestPlugin(WebFrame* frame,
-             const WebPluginParams& params,
+  TestPlugin(const WebPluginParams& params,
              TestPluginWebFrameClient* test_client)
-      : FakeWebPlugin(frame, params) {
-    test_client_ = test_client;
-  }
+      : FakeWebPlugin(params), test_client_(test_client) {}
 
   bool HasSelection() const override { return true; }
   WebString SelectionAsText() const override { return WebString("x"); }
   WebString SelectionAsMarkup() const override { return WebString("y"); }
   bool SupportsPaginatedPrint() override { return true; }
   int PrintBegin(const WebPrintParams& print_params) override { return 1; }
   void PrintPage(int page_number, WebCanvas*) override;
 
  private:
-  TestPluginWebFrameClient* test_client_;
+  TestPluginWebFrameClient* const test_client_;
 };
 
 class TestPluginWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
-  WebPlugin* CreatePlugin(WebLocalFrame* frame,
-                          const WebPluginParams& params) override {
+  WebPlugin* CreatePlugin(const WebPluginParams& params) override {
     if (params.mime_type == "application/x-webkit-test-webplugin" ||
         params.mime_type == "application/pdf")
-      return new TestPlugin(frame, params, this);
-    return WebFrameClient::CreatePlugin(frame, params);
+      return new TestPlugin(params, this);
+    return WebFrameClient::CreatePlugin(params);
   }
 
  public:
   void OnPrintPage() { printed_page_ = true; }
-  bool PrintedAtLeastOnePage() { return printed_page_; }
+  bool PrintedAtLeastOnePage() const { return printed_page_; }
 
  private:
   bool printed_page_ = false;
 };
 
 void TestPlugin::PrintPage(int page_number, WebCanvas* canvas) {
   DCHECK(test_client_);
   test_client_->OnPrintPage();
 }
 
@@ skipping 284 matching lines @@
       KeyboardEvent::Create(web_keyboard_event_insert, 0);
   ToWebPluginContainerImpl(plugin_container_one_element.PluginContainer())
       ->HandleEvent(key_event_insert);
   EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText(
                                 WebClipboard::Buffer()));
 }
 
 // A class to facilitate testing that events are correctly received by plugins.
 class EventTestPlugin : public FakeWebPlugin {
  public:
-  EventTestPlugin(WebFrame* frame, const WebPluginParams& params)
-      : FakeWebPlugin(frame, params),
-        last_event_type_(WebInputEvent::kUndefined) {}
+  explicit EventTestPlugin(const WebPluginParams& params)
+      : FakeWebPlugin(params), last_event_type_(WebInputEvent::kUndefined) {}
 
   WebInputEventResult HandleInputEvent(const WebInputEvent& event,
                                        WebCursorInfo&) override {
     last_event_type_ = event.GetType();
     if (WebInputEvent::IsMouseEventType(event.GetType()) ||
         event.GetType() == WebInputEvent::kMouseWheel) {
       const WebMouseEvent& mouse_event =
           static_cast<const WebMouseEvent&>(event);
       last_event_location_ = IntPoint(mouse_event.PositionInWidget().x,
                                       mouse_event.PositionInWidget().y);
@@ skipping 463 matching lines @@
   // Cause the plugin's frame to be detached.
   web_view_helper.Reset();
 }
 
 TEST_F(WebPluginContainerTest, TopmostAfterDetachTest) {
   static WebRect topmost_rect(10, 10, 40, 40);
 
   // Plugin that checks isRectTopmost in destroy().
   class TopmostPlugin : public FakeWebPlugin {
    public:
-    TopmostPlugin(WebFrame* frame, const WebPluginParams& params)
-        : FakeWebPlugin(frame, params) {}
+    explicit TopmostPlugin(const WebPluginParams& params)
+        : FakeWebPlugin(params) {}
 
     bool IsRectTopmost() { return Container()->IsRectTopmost(topmost_rect); }
 
     void Destroy() override {
-      // In destroy, isRectTopmost is no longer valid.
+      // In destroy, IsRectTopmost is no longer valid.
       EXPECT_FALSE(Container()->IsRectTopmost(topmost_rect));
       FakeWebPlugin::Destroy();
     }
   };
 
   RegisterMockedURL("plugin_container.html");
-  CustomPluginWebFrameClient<TopmostPlugin>
-      plugin_web_frame_client;  // Must outlive webViewHelper.
+  // The client must outlive WebViewHelper.
+  CustomPluginWebFrameClient<TopmostPlugin> plugin_web_frame_client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
       base_url_ + "plugin_container.html", true, &plugin_web_frame_client);
   DCHECK(web_view);
   web_view->GetSettings()->SetPluginsEnabled(true);
   web_view->Resize(WebSize(300, 300));
   web_view->UpdateAllLifecyclePhases();
   RunPendingTasks();
 
   WebPluginContainerImpl* plugin_container_impl =
@@ skipping 10 matching lines @@
   // Cause the plugin's frame to be detached.
   web_view_helper.Reset();
 
   EXPECT_FALSE(plugin_container_impl->IsRectTopmost(topmost_rect));
 }
 
 namespace {
 
 class CompositedPlugin : public FakeWebPlugin {
  public:
-  CompositedPlugin(WebLocalFrame* frame, const WebPluginParams& params)
-      : FakeWebPlugin(frame, params),
+  explicit CompositedPlugin(const WebPluginParams& params)
+      : FakeWebPlugin(params),
         layer_(Platform::Current()->CompositorSupport()->CreateLayer()) {}
 
   WebLayer* GetWebLayer() const { return layer_.get(); }
 
   // WebPlugin
 
   bool Initialize(WebPluginContainer* container) override {
     if (!FakeWebPlugin::Initialize(container))
       return false;
     container->SetWebLayer(layer_.get());
@@ skipping 70 matching lines @@
       web_view->MainFrame()->GetDocument().GetElementById(
           WebString::FromUTF8("translated-plugin"));
   plugin_container_one_element.PluginContainer()->SetWantsWheelEvents(true);
 
   RunPendingTasks();
   EXPECT_TRUE(web_view->GetPage()->GetEventHandlerRegistry().HasEventHandlers(
       EventHandlerRegistry::kWheelEventBlocking));
 }
 
 }  // namespace blink