Update from https://crrev.com/312398

net/socket/client_socket_pool_manager_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
 
 #include <map>
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 23 matching lines @@
 class TransportClientSocketPool;
 class TransportSecurityState;
 
 namespace internal {
 
 // A helper class for auto-deleting Values in the destructor.
 template <typename Key, typename Value>
 class OwnedPoolMap : public std::map<Key, Value> {
  public:
   OwnedPoolMap() {
-    COMPILE_ASSERT(base::is_pointer<Value>::value,
-                   value_must_be_a_pointer);
+    static_assert(base::is_pointer<Value>::value, "value must be a pointer");
   }
 
   ~OwnedPoolMap() {
     STLDeleteValues(this);
   }
 };
 
 }  // namespace internal
 
 class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
@@ skipping 89 matching lines @@
 
   ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
   SSLSocketPoolMap ssl_socket_pools_for_proxies_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_