Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/intents/web_intents_registry.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #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"
 
 // Handles storing and retrieving of web intents in the web database.
 // The registry provides filtering logic to retrieve specific types of intents.
 class WebIntentsRegistry
     : public WebDataServiceConsumer,
       public ProfileKeyedService {
  public:
   // Unique identifier for intent queries.
   typedef int QueryID;
 
-  typedef std::vector<WebIntentServiceData> IntentList;
+  typedef std::vector<webkit_glue::WebIntentServiceData> IntentServiceList;
 
   // An interface the WebIntentsRegistry uses to notify its clients when
   // it has finished loading intents data from the web database.
   class Consumer {
    public:
     // Notifies the observer that the intents request has been completed.
     virtual void OnIntentsQueryDone(
         QueryID query_id,
-        const IntentList& intents) = 0;
+        const IntentServiceList& intents) = 0;
 
    protected:
     virtual ~Consumer() {}
   };
 
   // Initializes, binds to a valid WebDataService.
   void Initialize(scoped_refptr<WebDataService> wds,
                   ExtensionServiceInterface* extension_service);
 
   // Registers a web intent provider.
-  virtual void RegisterIntentProvider(const WebIntentServiceData& intent);
+  virtual void RegisterIntentProvider(
+      const webkit_glue::WebIntentServiceData& intent);
 
   // Removes a web intent provider from the registry.
-  void UnregisterIntentProvider(const WebIntentServiceData& intent);
+  void UnregisterIntentProvider(
+      const webkit_glue::WebIntentServiceData& intent);
 
   // Requests all intent providers matching |action|.
   // |consumer| must not be NULL.
   QueryID GetIntentProviders(const string16& action, Consumer* consumer);
 
   // Requests all intent providers. |consumer| must not be NULL
   QueryID GetAllIntentProviders(Consumer* consumer);
 
  protected:
   // Make sure that only WebIntentsRegistryFactory can create an instance of
@@ skipping 29 matching lines @@
   // 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_