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

third_party/protobuf/src/google/protobuf/stubs/once_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 25 matching lines @@
 #include <unistd.h>
 #include <pthread.h>
 #endif
 
 #include <google/protobuf/stubs/once.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 namespace google {
 namespace protobuf {
+using internal::NewCallback;
 namespace {
 
 class OnceInitTest : public testing::Test {
  protected:
   void SetUp() {
     state_ = INIT_NOT_STARTED;
     current_test_ = this;
   }
 
   // Since ProtobufOnceType is only allowed to be allocated in static storage,
@@ skipping 64 matching lines @@
     }
 
     void Run() {
       callback_->Run();
       MutexLock lock(&done_mutex_);
       done_ = true;
     }
   };
 
   TestThread* RunInitOnceInNewThread() {
-    return new TestThread(NewCallback(this, &OnceInitTest::InitOnce));
+    return new TestThread(internal::NewCallback(this, &OnceInitTest::InitOnce));
   }
   TestThread* RunInitRecursiveOnceInNewThread() {
     return new TestThread(
-        NewCallback(this, &OnceInitTest::InitRecursiveOnce));
+        internal::NewCallback(this, &OnceInitTest::InitRecursiveOnce));
   }
 
   enum State {
     INIT_NOT_STARTED,
     INIT_STARTED,
     INIT_DONE
   };
   State CurrentState() {
     MutexLock lock(&mutex_);
     return state_;
@@ skipping 100 matching lines @@
 
   for (int i = 0; i < 8; i++) {
     threads[i]->Join();
   }
   EXPECT_EQ(INIT_DONE, CurrentState());
 }
 
 }  // anonymous namespace
 }  // namespace protobuf
 }  // namespace google