Simplify how we get the plugin list in the webkit platform support by removing the intermediate met…

webkit/glue/webkitplatformsupport_impl.h

 // 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.
 
 #ifndef WEBKIT_PLATFORM_SUPPORT_IMPL_H_
 #define WEBKIT_PLATFORM_SUPPORT_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/platform_file.h"
 #include "base/timer/timer.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "ui/base/layout.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 namespace base {
 class MessageLoop;
 }
 
-namespace webkit {
-struct WebPluginInfo;
-}
-
 namespace WebKit {
 class WebSocketStreamHandle;
 }
 
 namespace webkit_glue {
 
 class WebSocketStreamHandleDelegate;
 class WebSocketStreamHandleBridge;
 
 class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
@@ skipping 17 matching lines @@
       const WebKit::WebURL& url);
   virtual size_t memoryUsageMB();
   virtual size_t actualMemoryUsageMB();
 #if defined(OS_ANDROID)  // Other OSes just use the default values.
   // TODO(jochen): Remove these.
   virtual size_t lowMemoryUsageMB();
   virtual size_t highMemoryUsageMB();
   virtual size_t highUsageDeltaMB();
 #endif
 
-  virtual void startHeapProfiling(const WebKit::WebString& /*prefix*/) OVERRIDE;
+  virtual void startHeapProfiling(const WebKit::WebString& prefix);
   virtual void stopHeapProfiling() OVERRIDE;
-  virtual void dumpHeapProfiling(const WebKit::WebString& /*reason*/) OVERRIDE;
+  virtual void dumpHeapProfiling(const WebKit::WebString& reason);
   virtual WebKit::WebString getHeapProfile() OVERRIDE;
 
   virtual bool processMemorySizesInBytes(size_t* private_bytes,
                                          size_t* shared_bytes);
   virtual bool memoryAllocatorWasteInBytes(size_t* size);
   virtual WebKit::WebURLLoader* createURLLoader();
   virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
   virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
   virtual WebKit::WebData parseDataURL(
       const WebKit::WebURL& url, WebKit::WebString& mimetype,
       WebKit::WebString& charset);
   virtual WebKit::WebURLError cancelledError(const WebKit::WebURL& url) const;
-  virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*);
   virtual void decrementStatsCounter(const char* name);
   virtual void incrementStatsCounter(const char* name);
   virtual void histogramCustomCounts(
     const char* name, int sample, int min, int max, int bucket_count);
   virtual void histogramEnumeration(
     const char* name, int sample, int boundary_value);
   virtual const unsigned char* getTraceCategoryEnabledFlag(
       const char* category_name);
   virtual long* getTraceSamplingState(const unsigned thread_bucket);
   virtual void addTraceEvent(
@@ skipping 32 matching lines @@
 
   // Gets a localized string given a message id.  Returns an empty string if the
   // message id is not found.
   virtual base::string16 GetLocalizedString(int message_id) = 0;
 
   // Returns the raw data for a resource.  This resource must have been
   // specified as BINDATA in the relevant .rc file.
   virtual base::StringPiece GetDataResource(int resource_id,
                                             ui::ScaleFactor scale_factor) = 0;
 
-  // Returns the list of plugins.
-  virtual void GetPlugins(bool refresh,
-                          std::vector<webkit::WebPluginInfo>* plugins) = 0;
   // Creates a ResourceLoaderBridge.
   virtual ResourceLoaderBridge* CreateResourceLoader(
       const ResourceLoaderBridge::RequestInfo& request_info) = 0;
   // Creates a WebSocketStreamHandleBridge.
   virtual WebSocketStreamHandleBridge* CreateWebSocketBridge(
       WebKit::WebSocketStreamHandle* handle,
       WebSocketStreamHandleDelegate* delegate) = 0;
 
   void SuspendSharedTimer();
   void ResumeSharedTimer();
   virtual void OnStartSharedTimer(base::TimeDelta delay) {}
 
  private:
   void DoTimeout() {
     if (shared_timer_func_ && !shared_timer_suspended_)
       shared_timer_func_();
   }
 
   base::MessageLoop* main_loop_;
   base::OneShotTimer<WebKitPlatformSupportImpl> shared_timer_;
   void (*shared_timer_func_)();
   double shared_timer_fire_time_;
   bool shared_timer_fire_time_was_set_while_suspended_;
   int shared_timer_suspended_;  // counter
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_PLATFORM_SUPPORT_IMPL_H_