Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/intents/web_intents_registry_unittest.cc

Index: chrome/browser/intents/web_intents_registry_unittest.cc
diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc
index f59f5c5f148b2834fba09b80115535dba56cadda..7fb208b758493d5ffdda4265ac2ad218e389237a 100644
--- a/chrome/browser/intents/web_intents_registry_unittest.cc
+++ b/chrome/browser/intents/web_intents_registry_unittest.cc
@@ -146,7 +146,7 @@ class TestConsumer: public WebIntentsRegistry::Consumer {
  public:
    virtual void OnIntentsQueryDone(
        WebIntentsRegistry::QueryID id,
-       const std::vector<WebIntentServiceData>& services) {
+       const std::vector<webkit_glue::WebIntentServiceData>& services) {
      DCHECK(id == expected_id_);
      services_ = services;
 
@@ -161,12 +161,15 @@ class TestConsumer: public WebIntentsRegistry::Consumer {
      MessageLoop::current()->Run();
    }
 
-   WebIntentsRegistry::QueryID expected_id_;  // QueryID callback is tied to.
-   std::vector<WebIntentServiceData> services_;  // Result data from callback.
+   // QueryID callback is tied to.
+   WebIntentsRegistry::QueryID expected_id_;
+
+   // Result data from callback.
+   std::vector<webkit_glue::WebIntentServiceData> services_;
 };
 
 TEST_F(WebIntentsRegistryTest, BasicTests) {
-  WebIntentServiceData service;
+  webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
@@ -202,7 +205,7 @@ TEST_F(WebIntentsRegistryTest, BasicTests) {
 }
 
 TEST_F(WebIntentsRegistryTest, GetAllIntents) {
-  WebIntentServiceData service;
+  webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
@@ -252,7 +255,7 @@ TEST_F(WebIntentsRegistryTest, GetIntentsFromMixedSources) {
   extensions_.push_back(LoadAndExpectSuccess("intent_valid.json"));
   extensions_.push_back(LoadAndExpectSuccess("intent_valid_2.json"));
 
-  WebIntentServiceData service;
+  webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://somewhere.com/intent/edit.html");
   service.action = ASCIIToUTF16("http://webintents.org/edit");
   service.type = ASCIIToUTF16("image/*");