Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/intents/web_intents_model.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/ui/intents/web_intents_model.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/web_intents_registry.h"
@@ skipping 103 matching lines @@
   }
 }
 
 void WebIntentsModel::LoadModel() {
   NotifyObserverBeginBatch();
   intents_registry_->GetAllIntentProviders(this);
 }
 
 void WebIntentsModel::OnIntentsQueryDone(
     WebIntentsRegistry::QueryID query_id,
-    const std::vector<WebIntentServiceData>& services) {
+    const std::vector<webkit_glue::WebIntentServiceData>& services) {
   for (size_t i = 0; i < services.size(); ++i) {
     // Eventually do some awesome sorting, grouping, clustering stuff here.
     // For now, just stick it in the model flat.
     WebIntentsTreeNode* n = new WebIntentsTreeNode(ASCIIToUTF16(
         services[i].service_url.host()));
     ServiceTreeNode* ns = new ServiceTreeNode(ASCIIToUTF16(
         services[i].service_url.host()));
     ns->SetServiceName(services[i].title);
     ns->SetServiceUrl(ASCIIToUTF16(services[i].service_url.spec()));
     GURL icon_url = services[i].service_url.GetOrigin().Resolve("/favicon.ico");
@@ skipping 19 matching lines @@
 
 void WebIntentsModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       intents_observer_list_,
                       TreeModelEndBatch(this));
   }
 }