Bluetooth API: improve discovery

This CL:
- eliminates unnecessary dispatches
- correctly handles devices that are discovered before interest is
registered

TEST=ran api test
BUG=133179

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=150898

Review URL: https://chromiumcodereview.appspot.com/10815072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151138 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 15 insertions, 6 deletions

diff --git a/chrome/renderer/pepper/pepper_flash_renderer_message_filter.cc b/chrome/renderer/pepper/pepper_flash_renderer_message_filter.cc
index c556ae0..5917a43 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_message_filter.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_message_filter.cc
@@ -5,13 +5,15 @@
 #include "chrome/renderer/pepper/pepper_flash_renderer_message_filter.h"
 
 #include "chrome/renderer/pepper/ppb_pdf_impl.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 namespace chrome {
 
 PepperFlashRendererMessageFilter::PepperFlashRendererMessageFilter(
-    ppapi::host::PpapiHost* host)
-    : InstanceMessageFilter(host) {
+    content::RendererPpapiHost* host)
+    : InstanceMessageFilter(host->GetPpapiHost()),
+      host_(host) {
 }
 
 PepperFlashRendererMessageFilter::~PepperFlashRendererMessageFilter() {
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_message_filter.h b/chrome/renderer/pepper/pepper_flash_renderer_message_filter.h
index 3a39ae6..6bda03d 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_message_filter.h
+++ b/chrome/renderer/pepper/pepper_flash_renderer_message_filter.h
@@ -10,6 +10,10 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/host/instance_message_filter.h"
 
+namespace content {
+class RendererPpapiHost;
+}
+
 namespace chrome {
 
 // Implements the backend for Flash-specific messages from a plugin process.
@@ -18,7 +22,7 @@ class PepperFlashRendererMessageFilter
  public:
   // This class is designed to be heap-allocated. It will attach itself to the
   // given host and delete itself when the host is destroyed.
-  explicit PepperFlashRendererMessageFilter(ppapi::host::PpapiHost* host);
+  explicit PepperFlashRendererMessageFilter(content::RendererPpapiHost* host);
   virtual ~PepperFlashRendererMessageFilter();
 
   // InstanceMessageFilter:
@@ -28,6 +32,8 @@ class PepperFlashRendererMessageFilter
   // Message handlers.
   void OnHostMsgInvokePrinting(PP_Instance instance);
 
+  content::RendererPpapiHost* host_;
+
   DISALLOW_COPY_AND_ASSIGN(PepperFlashRendererMessageFilter);
 };
 
diff --git a/chrome/renderer/pepper/pepper_helper.cc b/chrome/renderer/pepper/pepper_helper.cc
index 4cd5c4d..37b904c 100644
--- a/chrome/renderer/pepper/pepper_helper.cc
+++ b/chrome/renderer/pepper/pepper_helper.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
 #include "chrome/renderer/pepper/pepper_flash_renderer_message_filter.h"
+#include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/host/ppapi_host.h"
 
 namespace chrome {
@@ -17,11 +18,11 @@ PepperHelper::PepperHelper(content::RenderView* render_view)
 PepperHelper::~PepperHelper() {
 }
 
-void PepperHelper::DidCreatePepperPlugin(ppapi::host::PpapiHost* host) {
+void PepperHelper::DidCreatePepperPlugin(content::RendererPpapiHost* host) {
   // TODO(brettw) figure out how to hook up the host factory. It needs some
   // kind of filter-like system to allow dynamic additions.
   // new ChromeRendererPepperHostFactory(host);
-  host->AddInstanceMessageFilter(
+  host->GetPpapiHost()->AddInstanceMessageFilter(
       scoped_ptr<ppapi::host::InstanceMessageFilter>(
           new PepperFlashRendererMessageFilter(host)));
 }
diff --git a/chrome/renderer/pepper/pepper_helper.h b/chrome/renderer/pepper/pepper_helper.h
index 969a80e..5f810b8 100644
--- a/chrome/renderer/pepper/pepper_helper.h
+++ b/chrome/renderer/pepper/pepper_helper.h
@@ -18,7 +18,7 @@ class PepperHelper : public content::RenderViewObserver {
   virtual ~PepperHelper();
 
   // RenderViewObserver.
-  virtual void DidCreatePepperPlugin(ppapi::host::PpapiHost* host) OVERRIDE;
+  virtual void DidCreatePepperPlugin(content::RendererPpapiHost* host) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PepperHelper);