Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/webdata/web_data_service.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_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 13 matching lines @@
 class CreditCard;
 class GURL;
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 class MessageLoop;
 class Profile;
 class SkBitmap;
 class TemplateURL;
 class WebDatabase;
-struct WebIntentServiceData;
 
 namespace base {
 class Thread;
 }
 
 namespace webkit_glue {
 struct FormField;
 struct PasswordForm;
+struct WebIntentServiceData;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService is a generic data repository for meta data associated with
 // web pages. All data is retrieved and archived in an asynchronous way.
 //
 // All requests return a handle. The handle can be used to cancel the request.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 304 matching lines @@
   // specified web app.
   Handle GetWebAppImages(const GURL& app_url, WebDataServiceConsumer* consumer);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Intents
   //
   //////////////////////////////////////////////////////////////////////////////
 
   // Adds a web intent provider registration.
-  void AddWebIntent(const WebIntentServiceData& service);
+  void AddWebIntent(const webkit_glue::WebIntentServiceData& service);
 
   // Removes a web intent provider registration.
-  void RemoveWebIntent(const WebIntentServiceData& service);
+  void RemoveWebIntent(const webkit_glue::WebIntentServiceData& service);
 
   // Get all web intent providers registered for the specified |action|.
   // |consumer| must not be NULL.
   Handle GetWebIntents(const string16& action,
                        WebDataServiceConsumer* consumer);
 
   // Get all web intent providers registered. |consumer| must not be NULL.
   Handle GetAllWebIntents(WebDataServiceConsumer* consumer);
 
   //////////////////////////////////////////////////////////////////////////////
@@ skipping 228 matching lines @@
   void SetWebAppImageImpl(GenericRequest2<GURL, SkBitmap>* request);
   void SetWebAppHasAllImagesImpl(GenericRequest2<GURL, bool>* request);
   void RemoveWebAppImpl(GenericRequest<GURL>* request);
   void GetWebAppImagesImpl(GenericRequest<GURL>* request);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Intents.
   //
   //////////////////////////////////////////////////////////////////////////////
-  void AddWebIntentImpl(GenericRequest<WebIntentServiceData>* request);
-  void RemoveWebIntentImpl(GenericRequest<WebIntentServiceData>* request);
+  void AddWebIntentImpl(
+      GenericRequest<webkit_glue::WebIntentServiceData>* request);
+  void RemoveWebIntentImpl(
+      GenericRequest<webkit_glue::WebIntentServiceData>* request);
   void GetWebIntentsImpl(GenericRequest<string16>* request);
   void GetAllWebIntentsImpl(GenericRequest<std::string>* request);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Token Service.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   void RemoveAllTokensImpl(GenericRequest<std::string>* request);
@@ skipping 100 matching lines @@
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 
  protected:
   virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__