Hide PrivetHttpClient inside of PrivetV3Session

chrome/browser/extensions/api/gcd_private/gcd_private_api.cc

Index: chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
index 6a2f2f9c04b62f58a28865a4822edc5ad45433f6..2616be14eacaed566111ac068e40fda43edd7d5d 100644
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
@@ -10,12 +10,11 @@
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/api/gcd_private/privet_v3_session.h"
 #include "chrome/browser/local_discovery/endpoint_resolver.h"
-#include "chrome/browser/local_discovery/privet_http.h"
-#include "chrome/browser/local_discovery/privet_http_impl.h"
 #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace extensions {
 
@@ -85,8 +84,7 @@ class GcdPrivateAPIImpl {
                            const base::DictionaryValue& input,
                            const MessageResponseCallback& callback);
 
-  void OnServiceResolved(const std::string& service_name,
-                         int session_id,
+  void OnServiceResolved(int session_id,
                          const CreateSessionCallback& callback,
                          const net::IPEndPoint& endpoint);
 
@@ -135,13 +133,11 @@ void GcdPrivateAPIImpl::CreateSession(const std::string& service_name,
   auto& session_data = sessions_[session_id];
   session_data.resolver.reset(new local_discovery::EndpointResolver());
   session_data.resolver->Start(
-      service_name,
-      base::Bind(&GcdPrivateAPIImpl::OnServiceResolved, base::Unretained(this),
-                 service_name, session_id, callback));
+      service_name, base::Bind(&GcdPrivateAPIImpl::OnServiceResolved,
+                               base::Unretained(this), session_id, callback));
 }
 
-void GcdPrivateAPIImpl::OnServiceResolved(const std::string& service_name,
-                                          int session_id,
+void GcdPrivateAPIImpl::OnServiceResolved(int session_id,
                                           const CreateSessionCallback& callback,
                                           const net::IPEndPoint& endpoint) {
   if (endpoint.address().empty()) {
@@ -149,11 +145,9 @@ void GcdPrivateAPIImpl::OnServiceResolved(const std::string& service_name,
                         base::DictionaryValue());
   }
   auto& session_data = sessions_[session_id];
-  net::HostPortPair host_port = net::HostPortPair::FromIPEndPoint(endpoint);
-  scoped_ptr<local_discovery::PrivetHTTPClient> client(
-      new local_discovery::PrivetHTTPClientImpl(
-          service_name, host_port, browser_context_->GetRequestContext()));
-  session_data.session.reset(new PrivetV3Session(client.Pass()));
+  session_data.session.reset(
+      new PrivetV3Session(browser_context_->GetRequestContext(),
+                          net::HostPortPair::FromIPEndPoint(endpoint)));
   session_data.session->Init(base::Bind(callback, session_id));
 }