Update from https://crrev.com/302630

net/websockets/websocket_channel_test.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 "net/websockets/websocket_channel.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include <iostream>
@@ skipping 404 matching lines @@
 };
 
 // The definition of EqualsFrames GoogleMock matcher. Unlike the ReturnFrames
 // action, this can take the array by reference.
 template <size_t N>
 ::testing::Matcher<ScopedVector<WebSocketFrame>*> EqualsFrames(
     const InitFrame (&frames)[N]) {
   return ::testing::MakeMatcher(new EqualsFramesMatcher<N>(&frames));
 }
 
-// TestClosure works like TestCompletionCallback, but doesn't take an argument.
-class TestClosure {
- public:
-  base::Closure closure() { return base::Bind(callback_.callback(), OK); }
-
-  void WaitForResult() { callback_.WaitForResult(); }
-
- private:
-  // Delegate to TestCompletionCallback for the implementation.
-  TestCompletionCallback callback_;
-};
-
 // A GoogleMock action to run a Closure.
 ACTION_P(InvokeClosure, closure) { closure.Run(); }
 
 // A GoogleMock action to run a Closure and return CHANNEL_DELETED.
 ACTION_P(InvokeClosureReturnDeleted, closure) {
   closure.Run();
   return WebSocketEventInterface::CHANNEL_DELETED;
 }
 
 // A FakeWebSocketStream whose ReadFrames() function returns data.
@@ skipping 2974 matching lines @@
   channel_->StartClosingHandshake(kWebSocketNormalClosure, "OK");
   ASSERT_TRUE(read_frames);
   // Provide the "Close" message from the server.
   *read_frames = CreateFrameVector(frames);
   read_callback.Run(OK);
   completion.WaitForResult();
 }
 
 }  // namespace
 }  // namespace net