Update from https://crrev.com/316786

net/quic/crypto/strike_register_test.cc

 // Copyright (c) 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/quic/crypto/strike_register.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/rand_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 using net::InsertStatus;
 using net::StrikeRegister;
-using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
 using std::string;
 
 const uint8 kOrbit[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
 // StrikeRegisterTests don't look at the random bytes so this function can
 // simply set the random bytes to 0.
 void SetNonce(uint8 nonce[32], unsigned time, const uint8 orbit[8]) {
@@ skipping 196 matching lines @@
       return net::NONCE_INVALID_TIME_FAILURE;
     }
 
     // Check that the timestamp is in the current window.
     if ((current_time > window_secs_ &&
          nonce_time < (current_time - window_secs_)) ||
         nonce_time > (current_time + window_secs_)) {
       return net::NONCE_INVALID_TIME_FAILURE;
     }
 
-    pair<uint32, string> nonce = make_pair(
-        nonce_time,
-        string(reinterpret_cast<const char*>(nonce_bytes), 32));
+    pair<uint32, string> nonce = std::make_pair(
+        nonce_time, string(reinterpret_cast<const char*>(nonce_bytes), 32));
 
     set<pair<uint32, string> >::const_iterator it = nonces_.find(nonce);
     if (it != nonces_.end()) {
       return net::NONCE_NOT_UNIQUE_FAILURE;
     }
 
     nonces_.insert(nonce);
     return net::NONCE_OK;
   }
 
@@ skipping 151 matching lines @@
       break;
     }
   }
 
   if (i != kMaxIterations) {
     FAIL() << "Failed after " << i << " iterations";
   }
 }
 
 }  // anonymous namespace