Update some unit test fixtures to use OnceClosure.

This finishes conversion of base::Bind and friends in net/reporting,
net/server, and net/websockets.

Bug: 1007815
Change-Id: I8c8e060198cc9058c865b36e7f8529e49c1f65a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288106Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: Steve Kobes <skobes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786566}

net/reporting/reporting_uploader_unittest.cc

@@ -119,7 +119,7 @@ class TestUploadCallback {
 
     if (waiting_) {
       waiting_ = false;
-      closure_.Run();
+      std::move(closure_).Run();
     }
   }
 
@@ -127,7 +127,7 @@ class TestUploadCallback {
   ReportingUploader::Outcome outcome_;
 
   bool waiting_;
-  base::Closure closure_;
+  base::OnceClosure closure_;
 };
 
 TEST_F(ReportingUploaderTest, Upload) {

net/server/http_server_unittest.cc

@@ -199,7 +199,7 @@ class HttpServerTest : public TestWithTaskEnvironment,
                      const HttpServerRequestInfo& info) override {
     requests_.push_back(std::make_pair(info, connection_id));
     if (requests_.size() == quit_after_request_count_)
-      run_loop_quit_func_.Run();
+      std::move(run_loop_quit_func_).Run();
   }
 
   void OnWebSocketRequest(int connection_id,
@@ -215,7 +215,7 @@ class HttpServerTest : public TestWithTaskEnvironment,
     DCHECK(connection_map_.find(connection_id) != connection_map_.end());
     connection_map_[connection_id] = false;
     if (connection_id == quit_on_close_connection_)
-      run_loop_quit_func_.Run();
+      std::move(run_loop_quit_func_).Run();
   }
 
   void RunUntilRequestsReceived(size_t count) {
@@ -224,7 +224,7 @@ class HttpServerTest : public TestWithTaskEnvironment,
       return;
 
     base::RunLoop run_loop;
-    base::AutoReset<base::RepeatingClosure> run_loop_quit_func(
+    base::AutoReset<base::OnceClosure> run_loop_quit_func(
         &run_loop_quit_func_, run_loop.QuitClosure());
     run_loop.Run();
 
@@ -250,7 +250,7 @@ class HttpServerTest : public TestWithTaskEnvironment,
     }
 
     base::RunLoop run_loop;
-    base::AutoReset<base::RepeatingClosure> run_loop_quit_func(
+    base::AutoReset<base::OnceClosure> run_loop_quit_func(
         &run_loop_quit_func_, run_loop.QuitClosure());
     run_loop.Run();
 
@@ -283,7 +283,7 @@ class HttpServerTest : public TestWithTaskEnvironment,
  protected:
   std::unique_ptr<HttpServer> server_;
   IPEndPoint server_address_;
-  base::Closure run_loop_quit_func_;
+  base::OnceClosure run_loop_quit_func_;
   std::vector<std::pair<HttpServerRequestInfo, int> > requests_;
   std::unordered_map<int /* connection_id */, bool /* connected */>
       connection_map_;

net/websockets/websocket_stream_create_test_base.cc

@@ -27,8 +27,8 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
     : public WebSocketStream::ConnectDelegate {
  public:
   TestConnectDelegate(WebSocketStreamCreateTestBase* owner,
-                      const base::Closure& done_callback)
-      : owner_(owner), done_callback_(done_callback) {}
+                      base::OnceClosure done_callback)
+      : owner_(owner), done_callback_(std::move(done_callback)) {}
 
   void OnCreateRequest(URLRequest* request) override {
     owner_->url_request_ = request;
@@ -41,13 +41,13 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
       ADD_FAILURE();
     owner_->response_info_ = std::move(response);
     stream.swap(owner_->stream_);
-    done_callback_.Run();
+    std::move(done_callback_).Run();
   }
 
   void OnFailure(const std::string& message) override {
     owner_->has_failed_ = true;
     owner_->failure_message_ = message;
-    done_callback_.Run();
+    std::move(done_callback_).Run();
   }
 
   void OnStartOpeningHandshake(
@@ -82,7 +82,7 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
 
  private:
   WebSocketStreamCreateTestBase* owner_;
-  base::Closure done_callback_;
+  base::OnceClosure done_callback_;
   DISALLOW_COPY_AND_ASSIGN(TestConnectDelegate);
 };