Use IntentsQuery as the WDS consumer. By unencumbering WebIntentsRegistry of this responsibility we…

chrome/browser/intents/web_intents_registry.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 CHROME_BROWSER_INTENTS_WEB_INTENTS_REGISTRY_H_
 #define CHROME_BROWSER_INTENTS_WEB_INTENTS_REGISTRY_H_
 
 #include "base/callback_forward.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "webkit/glue/web_intent_service_data.h"
 
 struct DefaultWebIntentService;
 
 namespace extensions {
 class Extension;
 }
 
 // Handles storing and retrieving of web intents services in the web database.
 // The registry provides filtering logic to retrieve specific types of services.
-class WebIntentsRegistry
-    : public WebDataServiceConsumer,
-      public ProfileKeyedService {
+class WebIntentsRegistry : public ProfileKeyedService {
  public:
   typedef std::vector<webkit_glue::WebIntentServiceData> IntentServiceList;
 
   // Callback used by WebIntentsRegistry to return results of data fetch.
   typedef base::Callback<void(const IntentServiceList&)>
       QueryCallback;
 
   // Callback to return results of a defaults query.
   typedef base::Callback<void(const DefaultWebIntentService&)>
       DefaultQueryCallback;
@@ skipping 66 matching lines @@
   WebIntentsRegistry();
   virtual ~WebIntentsRegistry();
 
   // Collapses a list of IntentServices by joining intents that have identical
   // service URLs, actions, and mime types.
   // |services| is the list of intent services to be collapsed when passed in
   // and will be modified with the new list in-place.
   void CollapseIntents(IntentServiceList* services);
 
  private:
-   const extensions::Extension* ExtensionForURL(const std::string& url);
+  const extensions::Extension* ExtensionForURL(const std::string& url);
 
-   struct IntentsQuery;
+  struct IntentsQuery;
+  typedef std::vector<IntentsQuery*> QueryVector;
 
-  // Maps web data requests to intents queries.
-  // Allows OnWebDataServiceRequestDone to forward to appropriate consumer.
-  typedef base::hash_map<WebDataService::Handle, IntentsQuery*> QueryMap;
-
-  // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(
-      WebDataService::Handle h,
-      const WDTypedResult* result) OVERRIDE;
-
-  // Delegate for defaults requests from OnWebDataServiceRequestDone.
-  virtual void OnWebDataServiceDefaultsRequestDone(
+  // Handles services loaded
+  void OnWebIntentsResultReceived(
+      IntentsQuery* query,
       WebDataService::Handle h,
       const WDTypedResult* result);
 
+  // Handles default services loaded
+  void OnWebIntentsDefaultsResultReceived(
+      IntentsQuery* query,
+      WebDataService::Handle h,
+      const WDTypedResult* result);
+
   // Implementation of GetIntentServicesForExtensionFilter.
   void DoGetIntentServicesForExtensionFilter(scoped_ptr<IntentsQuery> query,
                                              const std::string& extension_id);
 
+  // Adds a query to the list of pending queries.
+  void TrackQuery(IntentsQuery* query);
+
+  // Takes ownership of a query. This removes a query from the list
+  // of pending queries.
+  bool ClaimQuery(IntentsQuery* query);

[Greg Billock, 2012/07/27 00:41:29]

How about UntrackQuery?

+
   // Map for all in-flight web data requests/intent queries.
-  QueryMap queries_;
+  QueryVector pending_queries_;

[groby-ooo-7-16, 2012/07/27 00:11:26]

Why no map?

[Steve McKay, 2012/07/27 00:54:46]

The map only existed to associate wds handles with intent query objects. This
was needed to look up the query when processing a wds query response. Since the
IntentsQuery is now the consumer of the wds response we no longer need to do
this. The remaining purpose of the map was as an enumeration of active queries
needed for cleanup on object delete. This only requires some type of a simple
collection like a vector, so it makes sense to reduce the type to a vector.

 
   // Local reference to Web Data Service.
   scoped_refptr<WebDataService> wds_;
 
   // Local reference to the ExtensionService.
   // Shutdown/cleanup is handled by ProfileImpl. We are  guaranteed that any
   // ProfileKeyedService will be shut down before data on ProfileImpl is
   // destroyed (i.e. |extension_service_|), so |extension_service_| is valid
   // for the lifetime of the WebIntentsRegistry object.
   ExtensionServiceInterface* extension_service_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentsRegistry);
 };
 
 #endif  // CHROME_BROWSER_INTENTS_WEB_INTENTS_REGISTRY_H_