Fully qualify std::make_pair.

net/spdy/hpack_encoder_test.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 "net/spdy/hpack_encoder.h"
 
 #include <map>
 #include <string>
 
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 45 matching lines @@
   }
   void TakeString(string* out) {
     encoder_->output_stream_.TakeString(out);
   }
   void UpdateCharacterCounts(StringPiece str) {
     encoder_->UpdateCharacterCounts(str);
   }
   static void CookieToCrumbs(StringPiece cookie,
                              std::vector<StringPiece>* out) {
     Representations tmp;
-    HpackEncoder::CookieToCrumbs(make_pair("", cookie), &tmp);
+    HpackEncoder::CookieToCrumbs(std::make_pair("", cookie), &tmp);
 
     out->clear();
     for (size_t i = 0; i != tmp.size(); ++i) {
       out->push_back(tmp[i].second);
     }
   }
   static void DecomposeRepresentation(StringPiece value,
                                       std::vector<StringPiece>* out) {
     Representations tmp;
-    HpackEncoder::DecomposeRepresentation(make_pair("foobar", value), &tmp);
+    HpackEncoder::DecomposeRepresentation(std::make_pair("foobar", value),
+                                          &tmp);
 
     out->clear();
     for (size_t i = 0; i != tmp.size(); ++i) {
       out->push_back(tmp[i].second);
     }
   }
 
  private:
   HpackEncoder* encoder_;
 };
@@ skipping 375 matching lines @@
   expected_.AppendUint32(62);
   expected_.AppendPrefix(kStringLiteralIdentityEncoded);
   expected_.AppendUint32(3);
   expected_.AppendBytes("bar");
   CompareWithExpectedEncoding(headers);
 }
 
 }  // namespace
 
 }  // namespace net