Rename ServerBoundCert => ChannelID to reflect the current name.

chrome/browser/extensions/api/socket/tls_socket_unittest.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 "extensions/browser/api/socket/tls_socket.h"
 
 #include <deque>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/rand_callback.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Invoke;
 using testing::Gt;
 using testing::Return;
 using testing::SaveArg;
 using testing::WithArgs;
 using base::StringPiece;
 
-namespace net {
-class ServerBoundCertService;
-}
-
 namespace extensions {
 
 class MockSSLClientSocket : public net::SSLClientSocket {
  public:
   MockSSLClientSocket() {}
   MOCK_METHOD0(Disconnect, void());
   MOCK_METHOD3(Read,
                int(net::IOBuffer* buf,
                    int buf_len,
                    const net::CompletionCallback& callback));
@@ skipping 17 matching lines @@
                int(const StringPiece&,
                    bool,
                    const StringPiece&,
                    unsigned char*,
                    unsigned int));
   MOCK_METHOD1(GetTLSUniqueChannelBinding, int(std::string*));
   MOCK_METHOD1(GetSSLCertRequestInfo, void(net::SSLCertRequestInfo*));
   MOCK_METHOD2(GetNextProto,
                net::SSLClientSocket::NextProtoStatus(std::string*,
                                                      std::string*));
-  MOCK_CONST_METHOD0(GetServerBoundCertService, net::ServerBoundCertService*());
   MOCK_CONST_METHOD0(GetUnverifiedServerCertificateChain,
                      scoped_refptr<net::X509Certificate>());
   MOCK_CONST_METHOD0(GetChannelIDService, net::ChannelIDService*());

[wtc, 2014/07/30 01:05:59]

This file has both GetServerBoundCertService and GetChannelIDService. I removed
GetServerBoundCertService.

   virtual bool IsConnected() const OVERRIDE { return true; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket);
 };
 
 class MockTCPSocket : public net::TCPClientSocket {
  public:
   explicit MockTCPSocket(const net::AddressList& address_list)
       : net::TCPClientSocket(address_list, NULL, net::NetLog::Source()) {}
@@ skipping 226 matching lines @@
     total_bytes_written += amount_written_invocation;
     cb.first.Run(amount_written_invocation);
   }
 
   ASSERT_EQ(total_bytes_requested, total_bytes_written)
       << "There should be exactly as many bytes written as originally "
       << "requested to Write().";
 }
 
 }  // namespace extensions