Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/src/google/protobuf/arenastring_unittest.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 41 matching lines @@
 
 static string WrapString(const char* value) {
   return value;
 }
 
 // Test ArenaStringPtr with arena == NULL.
 TEST(ArenaStringPtrTest, ArenaStringPtrOnHeap) {
   ArenaStringPtr field;
   ::std::string default_value = "default";
   field.UnsafeSetDefault(&default_value);
-  EXPECT_EQ(string("default"), field.Get());
+  EXPECT_EQ(string("default"), field.Get(&default_value));
   field.Set(&default_value, WrapString("Test short"), NULL);
-  EXPECT_EQ(string("Test short"), field.Get());
+  EXPECT_EQ(string("Test short"), field.Get(&default_value));
   field.Set(&default_value, WrapString("Test long long long long value"), NULL);
-  EXPECT_EQ(string("Test long long long long value"), field.Get());
+  EXPECT_EQ(string("Test long long long long value"), field.Get(&default_value));
   field.Set(&default_value, string(""), NULL);
   field.Destroy(&default_value, NULL);
 
   ArenaStringPtr field2;
   field2.UnsafeSetDefault(&default_value);
   ::std::string* mut = field2.Mutable(&default_value, NULL);
   EXPECT_EQ(mut, field2.Mutable(&default_value, NULL));
-  EXPECT_EQ(mut, &field2.Get());
+  EXPECT_EQ(mut, &field2.Get(&default_value));
   EXPECT_NE(&default_value, mut);
   EXPECT_EQ(string("default"), *mut);
   *mut = "Test long long long long value";  // ensure string allocates storage
-  EXPECT_EQ(string("Test long long long long value"), field2.Get());
+  EXPECT_EQ(string("Test long long long long value"), field2.Get(&default_value));
   field2.Destroy(&default_value, NULL);
 }
 
 TEST(ArenaStringPtrTest, ArenaStringPtrOnArena) {
   google::protobuf::Arena arena;
   ArenaStringPtr field;
   ::std::string default_value = "default";
   field.UnsafeSetDefault(&default_value);
-  EXPECT_EQ(string("default"), field.Get());
+  EXPECT_EQ(string("default"), field.Get(&default_value));
   field.Set(&default_value, WrapString("Test short"), &arena);
-  EXPECT_EQ(string("Test short"), field.Get());
+  EXPECT_EQ(string("Test short"), field.Get(&default_value));
   field.Set(&default_value, WrapString("Test long long long long value"), &arena);
-  EXPECT_EQ(string("Test long long long long value"), field.Get());
+  EXPECT_EQ(string("Test long long long long value"),
+            field.Get(&default_value));
   field.Set(&default_value, string(""), &arena);
   field.Destroy(&default_value, &arena);
 
   ArenaStringPtr field2;
   field2.UnsafeSetDefault(&default_value);
   ::std::string* mut = field2.Mutable(&default_value, &arena);
   EXPECT_EQ(mut, field2.Mutable(&default_value, &arena));
-  EXPECT_EQ(mut, &field2.Get());
+  EXPECT_EQ(mut, &field2.Get(&default_value));
   EXPECT_NE(&default_value, mut);
   EXPECT_EQ(string("default"), *mut);
   *mut = "Test long long long long value";  // ensure string allocates storage
-  EXPECT_EQ(string("Test long long long long value"), field2.Get());
+  EXPECT_EQ(string("Test long long long long value"),
+            field2.Get(&default_value));
   field2.Destroy(&default_value, &arena);
 }
 
 }  // namespace protobuf
 }  // namespace google