Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/intents/web_intents_registry.cc

Index: chrome/browser/intents/web_intents_registry.cc
diff --git a/chrome/browser/intents/web_intents_registry.cc b/chrome/browser/intents/web_intents_registry.cc
index 4771be5f05470525ad99dce5429b29433276be3a..3ea0048a5bc77671c76bd9bbd1aa9f8e7de339f3 100644
--- a/chrome/browser/intents/web_intents_registry.cc
+++ b/chrome/browser/intents/web_intents_registry.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 
+using webkit_glue::WebIntentServiceData;
+
 // Internal object representing all data associated with a single query.
 struct WebIntentsRegistry::IntentsQuery {
   // Unique query identifier.
@@ -55,8 +57,8 @@ void WebIntentsRegistry::OnWebDataServiceRequestDone(
   queries_.erase(it);
 
   // TODO(groby): Filtering goes here.
-  IntentList matching_intents = static_cast<
-      const WDResult<IntentList>*>(result)->GetValue();
+  IntentServiceList matching_intents = static_cast<
+      const WDResult<IntentServiceList>*>(result)->GetValue();
 
   // Loop over all intents in all extensions, collect ones matching the query.
   if (extension_service_) {
@@ -64,8 +66,8 @@ void WebIntentsRegistry::OnWebDataServiceRequestDone(
     if (extensions) {
       for (ExtensionList::const_iterator i(extensions->begin());
            i != extensions->end(); ++i) {
-        const IntentList& intents((*i)->intents());
-        for (IntentList::const_iterator j(intents.begin());
+        const IntentServiceList& intents((*i)->intents_services());
+        for (IntentServiceList::const_iterator j(intents.begin());
              j != intents.end(); ++j) {
           if (query->action_.empty() || query->action_ == j->action)
             matching_intents.push_back(*j);