[Web Intents] Small refactor

chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 447 matching lines @@
             GetIndexOfTabContents(tab_contents_);
         chrome::ActivateTabAt(source_browser, source_index, false);
       }
     }
     service_tab_ = NULL;
   }
 
   intents_dispatcher_ = NULL;
 }
 
+void WebIntentPickerController::AddServiceToModel(
+    const webkit_glue::WebIntentServiceData& service) {
+  FaviconService* favicon_service = GetFaviconService(tab_contents_);
+
+  picker_model_->AddInstalledService(
+      service.title,
+      service.service_url,
+      ConvertDisposition(service.disposition));
+
+  pending_async_count_++;
+  FaviconService::Handle handle = favicon_service->GetFaviconForURL(
+      service.service_url,
+      history::FAVICON,
+      &favicon_consumer_,
+      base::Bind(
+          &WebIntentPickerController::OnFaviconDataAvailable,
+          weak_ptr_factory_.GetWeakPtr()));
+  favicon_consumer_.SetClientData(
+      favicon_service, handle, picker_model_->GetInstalledServiceCount() - 1);
+}
+
 void WebIntentPickerController::OnWebIntentServicesAvailable(
     const std::vector<webkit_glue::WebIntentServiceData>& services) {
-  FaviconService* favicon_service = GetFaviconService(tab_contents_);
-  for (size_t i = 0; i < services.size(); ++i) {
-    picker_model_->AddInstalledService(
-        services[i].title,
-        services[i].service_url,
-        ConvertDisposition(services[i].disposition));
-
-    pending_async_count_++;
-    FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-        services[i].service_url,
-        history::FAVICON,
-        &favicon_consumer_,
-        base::Bind(
-            &WebIntentPickerController::OnFaviconDataAvailable,
-            weak_ptr_factory_.GetWeakPtr()));
-    favicon_consumer_.SetClientData(favicon_service, handle, i);
-  }
+  for (size_t i = 0; i < services.size(); ++i)
+    AddServiceToModel(services[i]);
 
   RegistryCallsCompleted();
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::WebIntentServicesForExplicitIntent(
     const std::vector<webkit_glue::WebIntentServiceData>& services) {
   DCHECK(intents_dispatcher_);
   DCHECK(intents_dispatcher_->GetIntent().service.is_valid());
   for (size_t i = 0; i < services.size(); ++i) {
     if (services[i].service_url != intents_dispatcher_->GetIntent().service)
       continue;
 
-    picker_model_->AddInstalledService(
-        services[i].title,
-        services[i].service_url,
-        ConvertDisposition(services[i].disposition));
-
-    pending_async_count_++;
-    FaviconService* favicon_service = GetFaviconService(tab_contents_);
-    FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-        services[i].service_url,
-        history::FAVICON,
-        &favicon_consumer_,
-        base::Bind(
-            &WebIntentPickerController::OnFaviconDataAvailable,
-            weak_ptr_factory_.GetWeakPtr()));
-    favicon_consumer_.SetClientData(
-        favicon_service, handle,
-        picker_model_->GetInstalledServiceCount() - 1);
+    AddServiceToModel(services[i]);
 
     if (services[i].disposition ==
         webkit_glue::WebIntentServiceData::DISPOSITION_INLINE)
       CreatePicker();
     OnServiceChosen(services[i].service_url,
                     ConvertDisposition(services[i].disposition));
     AsyncOperationFinished();
     return;
   }
 
@@ skipping 241 matching lines @@
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }