Remove ServiceDiscoveryClient* from PrivetHTTPAsynchronousFactoryImpl interface

chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.cc

 // Copyright 2014 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/local_discovery/privet_http_asynchronous_factory_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/local_discovery/privet_http_impl.h"
+#include "chrome/browser/local_discovery/service_discovery_shared_client.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace local_discovery {
 
 namespace {
 
 std::string IPAddressToHostString(const net::IPAddressNumber& address) {
   std::string address_str = net::IPAddressToString(address);
 
   // IPv6 addresses need to be surrounded by brackets.
   if (address.size() == net::kIPv6AddressSize) {
     address_str = base::StringPrintf("[%s]", address_str.c_str());
   }
 
   return address_str;
 }
 
 }  // namespace
 
 PrivetHTTPAsynchronousFactoryImpl::PrivetHTTPAsynchronousFactoryImpl(
-    ServiceDiscoveryClient* service_discovery_client,
     net::URLRequestContextGetter* request_context)
-    : service_discovery_client_(service_discovery_client),
-      request_context_(request_context) {
+    : request_context_(request_context) {
 }
 
 PrivetHTTPAsynchronousFactoryImpl::~PrivetHTTPAsynchronousFactoryImpl() {
 }
 
 scoped_ptr<PrivetHTTPResolution>
 PrivetHTTPAsynchronousFactoryImpl::CreatePrivetHTTP(
     const std::string& name,
     const net::HostPortPair& address,
     const ResultCallback& callback) {
   return scoped_ptr<PrivetHTTPResolution>(
-      new ResolutionImpl(name,
-                         address,
-                         callback,
-                         service_discovery_client_,
-                         request_context_.get()));
+      new ResolutionImpl(name, address, callback, request_context_.get()));
 }
 
 PrivetHTTPAsynchronousFactoryImpl::ResolutionImpl::ResolutionImpl(
     const std::string& name,
     const net::HostPortPair& address,
     const ResultCallback& callback,
-    ServiceDiscoveryClient* service_discovery_client,
     net::URLRequestContextGetter* request_context)
     : name_(name),
       hostport_(address),
       callback_(callback),
       request_context_(request_context) {
+  service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
+
   net::AddressFamily address_family = net::ADDRESS_FAMILY_UNSPECIFIED;
-
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPrivetIPv6Only)) {
     address_family = net::ADDRESS_FAMILY_IPV6;
   }
 
-  resolver_ = service_discovery_client->CreateLocalDomainResolver(
-      address.host(),
-      address_family,
+  resolver_ = service_discovery_client_->CreateLocalDomainResolver(
+      address.host(), address_family,
       base::Bind(&ResolutionImpl::ResolveComplete, base::Unretained(this)));
 }
 
 PrivetHTTPAsynchronousFactoryImpl::ResolutionImpl::~ResolutionImpl() {
 }
 
 void PrivetHTTPAsynchronousFactoryImpl::ResolutionImpl::Start() {
   resolver_->Start();
 }
 
@@ skipping 17 matching lines @@
 
   DCHECK(!address.empty());
 
   net::HostPortPair new_address =
       net::HostPortPair(IPAddressToHostString(address), hostport_.port());
   callback_.Run(scoped_ptr<PrivetHTTPClient>(
       new PrivetHTTPClientImpl(name_, new_address, request_context_.get())));
 }
 
 }  // namespace local_discovery