Move 'intents' parsing out of Extension

chrome/browser/intents/web_intents_registry.cc

 // Copyright (c) 2012 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 <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/default_web_intent_service.h"
 #include "chrome/browser/intents/native_services.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
+#include "chrome/common/extensions/web_intents_handler.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 
 using extensions::Extension;
 using net::IsMimeType;
 
 namespace {
 
 // TODO(hshi): Temporary workaround for http://crbug.com/134197.
 // If no user-set default service is found, use built-in QuickOffice Viewer as
@@ skipping 17 matching lines @@
   return (IsMimeType(UTF16ToUTF8(type1)) && IsMimeType(UTF16ToUTF8(type2)))
       ? web_intents::MimeTypesMatch(type1, type2)
       : type1 == type2;
 }
 
 // Adds any intent services of |extension| that match |action| to
 // |matching_services|.
 void AddMatchingServicesForExtension(const Extension& extension,
                                      const string16& action,
                                      IntentServiceList* matching_services) {
-  const IntentServiceList& services = extension.intents_services();
+  const IntentServiceList& services =
+      extensions::WebIntentsInfo::GetIntentsServices(&extension);
   for (IntentServiceList::const_iterator i = services.begin();
        i != services.end(); ++i) {
     if (action.empty() || action == i->action)
       matching_services->push_back(*i);
   }
 }
 
 // Removes all services from |matching_services| that do not match |type|.
 // Wildcards are supported, of the form '<type>/*' or '*'.
 void FilterServicesByType(const string16& type,
@@ skipping 448 matching lines @@
 void WebIntentsRegistry::ReleaseQuery(QueryAdapter* query) {
   QueryVector::iterator it = std::find(
       pending_queries_.begin(), pending_queries_.end(), query);
   if (it != pending_queries_.end()) {
     pending_queries_.erase(it);
     delete query;
   } else {
     NOTREACHED();
   }
 }