third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 37 matching lines @@
 #include <google/protobuf/util/type_resolver_util.h>
 
 namespace google {
 namespace protobuf {
 namespace util {
 namespace converter {
 namespace testing {
 
 
 void TypeInfoTestHelper::ResetTypeInfo(
-    const vector<const Descriptor*>& descriptors) {
+    const std::vector<const Descriptor*>& descriptors) {
   switch (type_) {
     case USE_TYPE_RESOLVER: {
       const DescriptorPool* pool = descriptors[0]->file()->pool();
       for (int i = 1; i < descriptors.size(); ++i) {
         GOOGLE_CHECK(pool == descriptors[i]->file()->pool())
             << "Descriptors from different pools are not supported.";
       }
       type_resolver_.reset(
           NewTypeResolverForDescriptorPool(kTypeServiceBaseUrl, pool));
       typeinfo_.reset(TypeInfo::NewTypeInfo(type_resolver_.get()));
       return;
     }
   }
   GOOGLE_LOG(FATAL) << "Can not reach here.";
 }
 
 void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor) {
-  vector<const Descriptor*> descriptors;
+  std::vector<const Descriptor*> descriptors;
   descriptors.push_back(descriptor);
   ResetTypeInfo(descriptors);
 }
 
 void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor1,
                                        const Descriptor* descriptor2) {
-  vector<const Descriptor*> descriptors;
+  std::vector<const Descriptor*> descriptors;
   descriptors.push_back(descriptor1);
   descriptors.push_back(descriptor2);
   ResetTypeInfo(descriptors);
 }
 
 TypeInfo* TypeInfoTestHelper::GetTypeInfo() { return typeinfo_.get(); }
 
 ProtoStreamObjectSource* TypeInfoTestHelper::NewProtoSource(
     io::CodedInputStream* coded_input, const string& type_url) {
   const google::protobuf::Type* type = typeinfo_->GetTypeByTypeUrl(type_url);
@@ skipping 31 matching lines @@
   }
   GOOGLE_LOG(FATAL) << "Can not reach here.";
   return NULL;
 }
 
 }  // namespace testing
 }  // namespace converter
 }  // namespace util
 }  // namespace protobuf
 }  // namespace google