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 "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "net/base/mime_util.h"
 
 namespace {
 
 // Compares two mime types for equality. Supports wild cards in both
 // |type1| and |type2|. Wild cards are of the form '<type>/*' or '*'.
 bool MimeTypesAreEqual(const string16& type1, const string16& type2) {
   // We don't have a MIME matcher that allows patterns on both sides
   // Instead, we do two comparison, treating each type in turn as a
   // pattern. If either one matches, we consider this a MIME match.
   if (net::MatchesMimeType(UTF16ToUTF8(type1), UTF16ToUTF8(type2)))
     return true;
   return net::MatchesMimeType(UTF16ToUTF8(type2), UTF16ToUTF8(type1));
 }
 
 }  // namespace
 
+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);
   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);
 
-  IntentList matching_intents = static_cast<
-      const WDResult<IntentList>*>(result)->GetValue();
+  IntentServiceList matching_services = 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);
+            matching_services.push_back(*j);
         }
       }
     }
   }
 
   // Filter out all intents not matching the query type.
-  IntentList::iterator iter(matching_intents.begin());
-  while (iter != matching_intents.end()) {
+  IntentServiceList::iterator iter(matching_services.begin());
+  while (iter != matching_services.end()) {
     if (MimeTypesAreEqual(iter->type, query->type_))
       ++iter;
     else
-      iter = matching_intents.erase(iter);
+      iter = matching_services.erase(iter);
   }
 
-  query->consumer_->OnIntentsQueryDone(query->query_id_, matching_intents);
+  query->consumer_->OnIntentsQueryDone(query->query_id_, matching_services);
   delete query;
 }
 
 WebIntentsRegistry::QueryID WebIntentsRegistry::GetIntentProviders(
     const string16& action, const string16& mimetype, Consumer* consumer) {
   DCHECK(consumer);
   DCHECK(wds_.get());
 
   IntentsQuery* query = new IntentsQuery;
   query->query_id_ = next_query_id_++;
@@ skipping 25 matching lines @@
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->AddWebIntent(service);
 }
 
 void WebIntentsRegistry::UnregisterIntentProvider(
     const WebIntentServiceData& service) {
   DCHECK(wds_.get());
   wds_->RemoveWebIntent(service);
 }