Refactor WebIntentsRegistry internals to use closures as WebDataService results handlers.

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"
@@ skipping 90 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:
-  struct IntentsQuery;
-  typedef std::vector<IntentsQuery*> QueryVector;
+  struct QueryParams;
+  class QueryAdapter;
+  typedef std::vector<QueryAdapter*> QueryVector;
 
   // Handles services loaded
   void OnWebIntentsResultReceived(
-      IntentsQuery* query,
+      const QueryParams& params,
+      const QueryCallback& callback,
       const WDTypedResult* result);
 
   // Handles default services loaded
   void OnWebIntentsDefaultsResultReceived(
-      IntentsQuery* query,
+      const QueryParams& params,
+      const DefaultQueryCallback& callback,
       const WDTypedResult* result);
 
   // Implementation of GetIntentServicesForExtensionFilter.
-  void DoGetIntentServicesForExtensionFilter(scoped_ptr<IntentsQuery> query,
-                                             const std::string& extension_id);
+  void DoGetIntentServicesForExtensionFilter(
+      const QueryParams& params,
+      const std::string& extension_id,
+      const QueryCallback& callback);
 
   const extensions::Extension* ExtensionForURL(const std::string& url);
 
   // Adds a query to the list of pending queries.
-  void TrackQuery(IntentsQuery* query);
+  void TrackQuery(QueryAdapter* query);
 
   // Takes ownership of a query. This removes a query from the list
   // of pending queries.
-  void ReleaseQuery(IntentsQuery* query);
+  void ReleaseQuery(QueryAdapter* query);
 
   // Map for all in-flight web data requests/intent queries.
   QueryVector pending_queries_;
 
   // 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_