Hide PrivetHttpClient inside of PrivetV3Session

chrome/browser/extensions/api/gcd_private/privet_v3_session.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/extensions/api/gcd_private/privet_v3_session.h"
 
 #include "base/base64.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/local_discovery/privet_constants.h"
 #include "chrome/browser/local_discovery/privet_http.h"
+#include "chrome/browser/local_discovery/privet_http_impl.h"
 #include "chrome/browser/local_discovery/privet_url_fetcher.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "crypto/hmac.h"
 #include "crypto/p224_spake.h"
 #include "url/gurl.h"
 
 using local_discovery::PrivetURLFetcher;
 
 namespace extensions {
 
@@ skipping 166 matching lines @@
   if (session_) {
     if (!callback_.is_null()) {
       callback_.Run(result, value);
       callback_.Reset();
     }
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&PrivetV3Session::DeleteFetcher, session_,
                               base::Unretained(this)));
     session_.reset();
   }
+  url_fetcher_.reset();
 }
 
 void PrivetV3Session::FetcherDelegate::OnTimeout() {
   LOG(ERROR) << "PrivetURLFetcher timeout, url: " << url_fetcher_->url();
   ReplyAndDestroyItself(Result::STATUS_CONNECTIONERROR,
                         base::DictionaryValue());
 }
 
 PrivetV3Session::PrivetV3Session(
-    scoped_ptr<local_discovery::PrivetHTTPClient> client)
-    : client_(client.Pass()), weak_ptr_factory_(this) {}
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    const net::HostPortPair& host_port)
+    : client_(new local_discovery::PrivetHTTPClientImpl("",
+                                                        host_port,
+                                                        context_getter)),
+      weak_ptr_factory_(this) {}
 
 PrivetV3Session::~PrivetV3Session() {
   Cancel();
 }
 
 void PrivetV3Session::Init(const InitCallback& callback) {
   DCHECK(fetchers_.empty());
   DCHECK(!client_->IsInHttpsMode());
   DCHECK(session_id_.empty());
   DCHECK(privet_auth_token_.empty());
@@ skipping 234 matching lines @@
 void PrivetV3Session::Cancel() {
   // Cancel started unconfirmed sessions.
   if (session_id_.empty() || client_->IsInHttpsMode())
     return;
   base::DictionaryValue input;
   input.SetString(kPrivetV3KeySessionId, session_id_);
   StartPostRequest(kPrivetV3PairingCancelPath, input, MessageCallback());
 }
 
 }  // namespace extensions