Move callback and host port args into Start method

chrome/browser/local_discovery/privet_notifications_unittest.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/local_discovery/privet_http_asynchronous_factory.h"
 
 #include "chrome/browser/local_discovery/privet_http_impl.h"
 #include "chrome/browser/local_discovery/privet_notifications.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 23 matching lines @@
     : public PrivetNotificationsListener::Delegate {
  public:
   MOCK_METHOD2(PrivetNotify, void(bool multiple, bool added));
   MOCK_METHOD0(PrivetRemoveNotification, void());
 };
 
 class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory {
  public:
   class MockResolution : public PrivetHTTPResolution {
    public:
-    MockResolution(
-        const std::string& name,
-        net::URLRequestContextGetter* request_context,
-        const ResultCallback& callback)
-        : name_(name), request_context_(request_context), callback_(callback) {
-    }
+    MockResolution(const std::string& name,
+                   net::URLRequestContextGetter* request_context)
+        : name_(name), request_context_(request_context) {}
 
     ~MockResolution() override {}
 
-    void Start() override {
-      callback_.Run(scoped_ptr<PrivetHTTPClient>(new PrivetHTTPClientImpl(
+    void Start(const net::HostPortPair& address,
+               const ResultCallback& callback) override {
+      callback.Run(scoped_ptr<PrivetHTTPClient>(new PrivetHTTPClientImpl(
           name_, net::HostPortPair("1.2.3.4", 8080), request_context_.get())));
     }
 
     const std::string& GetName() override { return name_; }
 
    private:
     std::string name_;
     scoped_refptr<net::URLRequestContextGetter> request_context_;
-    ResultCallback callback_;
   };
 
   explicit MockPrivetHttpFactory(net::URLRequestContextGetter* request_context)
       : request_context_(request_context) {
   }
 
   scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP(
-      const std::string& name,
-      const net::HostPortPair& address,
-      const ResultCallback& callback) override {
+      const std::string& name) override {
     return scoped_ptr<PrivetHTTPResolution>(
-        new MockResolution(name, request_context_.get(), callback));
+        new MockResolution(name, request_context_.get()));
   }
 
  private:
     scoped_refptr<net::URLRequestContextGetter> request_context_;
 };
 
 class PrivetNotificationsListenerTest : public ::testing::Test {
  public:
   PrivetNotificationsListenerTest() : request_context_(
       new net::TestURLRequestContextGetter(base::MessageLoopProxy::current())) {
@@ skipping 122 matching lines @@
       true,
       kExampleDeviceName,
       description_);
 
   SuccessfulResponseToInfo(kInfoResponseNoUptime);
 }
 
 }  // namespace
 
 }  // namespace local_discovery