Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/intents/web_intents_registry.cc

 // 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.
 
 #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.
   QueryID query_id_;
 
   // Underlying data query.
   WebDataService::Handle pending_query_;
 
   // The consumer for this particular query.
   Consumer* consumer_;
@@ skipping 30 matching lines @@
   DCHECK(result->GetType() == WEB_INTENTS_RESULT);
 
   QueryMap::iterator it = queries_.find(h);
   DCHECK(it != queries_.end());
 
   IntentsQuery* query(it->second);
   DCHECK(query);
   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_) {
     const ExtensionList* extensions = extension_service_->extensions();
     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);
         }
       }
     }
   }
 
   query->consumer_->OnIntentsQueryDone(query->query_id_, matching_intents);
   delete query;
@@ skipping 33 matching lines @@
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->AddWebIntent(service);
 }
 
 void WebIntentsRegistry::UnregisterIntentProvider(
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->RemoveWebIntent(service);
 }