Extracted PrivetV1HTTPClient with Privet v1 specific operations.

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

 // Copyright 2013 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/webui/local_discovery/local_discovery_ui_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 162 matching lines @@
 
 void LocalDiscoveryUIHandler::HandleStart(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   // If privet_lister_ is already set, it is a mock used for tests or the result
   // of a reload.
   if (!privet_lister_) {
     service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
     privet_lister_.reset(
         new PrivetDeviceListerImpl(service_discovery_client_.get(), this));
-    privet_http_factory_ =
-        PrivetHTTPAsynchronousFactory::CreateInstance(
-            service_discovery_client_.get(), profile->GetRequestContext());
+    privet_http_factory_ = PrivetHTTPAsynchronousFactory::CreateInstance(
+        service_discovery_client_.get(), profile->GetRequestContext());
 
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetInstance()->GetForProfile(profile);
     if (signin_manager)
       signin_manager->AddObserver(this);
   }
 
   privet_lister_->Start();
   privet_lister_->DiscoverNewDevices(false);
 
@@ skipping 83 matching lines @@
   GURL url(signin::GetPromoURL(signin::SOURCE_DEVICES_PAGE,
                                true));  // auto close after success.
 
   browser->OpenURL(
       content::OpenURLParams(url, content::Referrer(), SINGLETON_TAB,
                              content::PAGE_TRANSITION_AUTO_BOOKMARK, false));
 }
 
 void LocalDiscoveryUIHandler::StartRegisterHTTP(
     scoped_ptr<PrivetHTTPClient> http_client) {
-  current_http_client_.swap(http_client);
+  current_http_client_ = PrivetV1HTTPClient::CreateDefault(http_client.Pass());
 
   std::string user = GetSyncAccount();
 
   if (!current_http_client_) {
     SendRegisterError();
     return;
   }
 
   current_register_operation_ =
       current_http_client_->CreateRegisterOperation(user, this);
@@ skipping 396 matching lines @@
     scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
 
     web_ui()->CallJavascriptFunction(
         "local_discovery.onUnregisteredDeviceUpdate", service_key, *null_value);
   }
 }
 
 #endif  // ENABLE_WIFI_BOOTSTRAPPING
 
 }  // namespace local_discovery