Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/webdata/web_intents_table.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_INTENTS_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_WEB_INTENTS_TABLE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 20 matching lines @@
 // Intents are uniquely identified by the <service_url,action,type> tuple.
 class WebIntentsTable : public WebDatabaseTable {
  public:
    WebIntentsTable(sql::Connection* db, sql::MetaTable* meta_table);
    virtual ~WebIntentsTable();
 
   // WebDatabaseTable implementation.
   virtual bool Init();
   virtual bool IsSyncable();
 
-  // Adds a web intent to the WebIntents table. If intent already exists,
-  // replaces it.
-  bool SetWebIntent(const WebIntentServiceData& intent);
+  // Adds a web intent service to the WebIntents table.
+  // If |service| already exists, replaces it.
+  bool SetWebIntent(const webkit_glue::WebIntentServiceData& service);
 
-  // Retrieve all intents from WebIntents table that match |action|.
+  // Retrieve all |services| from WebIntents table that match |action|.
   bool GetWebIntents(const string16& action,
-                     std::vector<WebIntentServiceData>* intents);
+                     std::vector<webkit_glue::WebIntentServiceData>* services);
 
-  // Retrieve all intents from WebIntents table.
-  bool GetAllWebIntents(std::vector<WebIntentServiceData>* intents);
+  // Retrieve all |services| from WebIntents table.
+  bool GetAllWebIntents(
+      std::vector<webkit_glue::WebIntentServiceData>* services);
 
-  // Removes intent from WebIntents table - must match all parameters exactly.
-  bool RemoveWebIntent(const WebIntentServiceData& intent);
+  // Removes |service| from WebIntents table - must match all parameters
+  // exactly.
+  bool RemoveWebIntent(const webkit_glue::WebIntentServiceData& service);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebIntentsTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_INTENTS_TABLE_H_