Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/intents/web_intent_picker_controller.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_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
   // |action|, |type| pair.
   void Fetch(const string16& action, const string16& type);
 
   // Cancels the WebDataService request.
   void Cancel();
 
  private:
   // WebIntentsRegistry::Consumer implementation.
   virtual void OnIntentsQueryDone(
       WebIntentsRegistry::QueryID,
-      const std::vector<WebIntentServiceData>& intents) OVERRIDE;
+      const std::vector<webkit_glue::WebIntentServiceData>& services) OVERRIDE;
 
   // A weak pointer to the picker controller.
   WebIntentPickerController* controller_;
 
   // A weak pointer to the web intents registry.
   WebIntentsRegistry* web_intents_registry_;
 
   // The ID of the current web intents request. The value will be -1 if
   // there is no request in flight.
   WebIntentsRegistry::QueryID query_id_;
@@ skipping 150 matching lines @@
 }
 
 void WebIntentPickerController::OnCancelled() {
   InvokingTabObserver forwarder(wrapper_, NULL, routing_id_);
   forwarder.Send(new IntentsMsg_WebIntentReply(
       0, webkit_glue::WEB_INTENT_PICKER_CANCELLED, string16(), intent_id_));
   ClosePicker();
 }
 
 void WebIntentPickerController::OnWebIntentDataAvailable(
-    const std::vector<WebIntentServiceData>& intent_data) {
+    const std::vector<webkit_glue::WebIntentServiceData>& services) {
   urls_.clear();
-  for (size_t i = 0; i < intent_data.size(); ++i) {
-    urls_.push_back(intent_data[i].service_url);
+  for (size_t i = 0; i < services.size(); ++i) {
+    urls_.push_back(services[i].service_url);
   }
 
   // Tell the picker to initialize N urls to the default favicon
   picker_->SetServiceURLs(urls_);
   favicon_fetcher_->Fetch(urls_);
   pending_async_count_--;
 }
 
 void WebIntentPickerController::OnFaviconDataAvailable(
     size_t index,
@@ skipping 28 matching lines @@
 void WebIntentPickerController::WebIntentDataFetcher::Fetch(
     const string16& action,
     const string16& type) {
   DCHECK(query_id_ == -1) << "Fetch already in process.";
   controller_->pending_async_count_++;
   query_id_ = web_intents_registry_->GetIntentProviders(action, type, this);
 }
 
 void WebIntentPickerController::WebIntentDataFetcher::OnIntentsQueryDone(
     WebIntentsRegistry::QueryID,
-    const std::vector<WebIntentServiceData>& intents) {
-  controller_->OnWebIntentDataAvailable(intents);
+    const std::vector<webkit_glue::WebIntentServiceData>& services) {
+  controller_->OnWebIntentDataAvailable(services);
   query_id_ = -1;
 }
 
 WebIntentPickerController::FaviconFetcher::FaviconFetcher(
     WebIntentPickerController* controller,
     FaviconService* favicon_service)
         : controller_(controller),
           favicon_service_(favicon_service) {
 }
 
@@ skipping 32 matching lines @@
     if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
                               favicon_data.image_data->size(),
                               &icon_bitmap)) {
       controller_->OnFaviconDataAvailable(index, icon_bitmap);
       return;
     }
   }
 
   controller_->OnFaviconDataUnavailable(index);
 }