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

2 files changed, 10 insertions, 8 deletions

diff --git a/ppapi/shared_impl/resource.cc b/ppapi/shared_impl/resource.cc
index c96bc21..6f095f7 100644
--- a/ppapi/shared_impl/resource.cc
+++ b/ppapi/shared_impl/resource.cc
@@ -56,8 +56,7 @@ void Resource::InstanceWasDeleted() {
   host_resource_ = HostResource();
 }
 
-void Resource::OnReplyReceived(int sequence,
-                               int32_t result,
+void Resource::OnReplyReceived(const proxy::ResourceMessageReplyParams& params,
                                const IPC::Message& msg) {
   NOTREACHED();
 }
diff --git a/ppapi/shared_impl/resource.h b/ppapi/shared_impl/resource.h
index efe40da..05dc783 100644
--- a/ppapi/shared_impl/resource.h
+++ b/ppapi/shared_impl/resource.h
@@ -71,6 +71,12 @@ class Message;
 
 namespace ppapi {
 
+// Normally we shouldn't reply on proxy here, but this is to support
+// OnReplyReceived. See that comment.
+namespace proxy {
+class ResourceMessageReplyParams;
+}
+
 // Forward declare all the resource APIs.
 namespace thunk {
 #define DECLARE_RESOURCE_CLASS(RESOURCE) class RESOURCE;
@@ -166,10 +172,8 @@ class PPAPI_SHARED_EXPORT Resource : public base::RefCounted<Resource> {
   template <typename T> T* GetAs() { return NULL; }
 
   // Called when a PpapiPluginMsg_ResourceReply reply is received for a
-  // previous CallRenderer. The sequence number is the value returned the
-  // send function for the given request. The message is the nested reply
-  // message, which may be an empty message (depending on what the host
-  // sends).
+  // previous CallRenderer. The message is the nested reply message, which may
+  // be an empty message (depending on what the host sends).
   //
   // The default implementation will assert (if you send a request, you should
   // override this function).
@@ -177,8 +181,7 @@ class PPAPI_SHARED_EXPORT Resource : public base::RefCounted<Resource> {
   // (This function would make more conceptual sense on PluginResource but we
   // need to call this function from general code that doesn't know how to
   // distinguish the classes.)
-  virtual void OnReplyReceived(int sequence,
-                               int32_t result,
+  virtual void OnReplyReceived(const proxy::ResourceMessageReplyParams& params,
                                const IPC::Message& msg);
 
  protected: