Revert 186925 since it breaks many of the builds on the bots (e.g.

ppapi/proxy/ppb_var_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "ppapi/c/pp_var.h"
@@ skipping 146 matching lines @@
     for (size_t i = 0; i < kNumStrings; ++i) {
       ppb_var->Release(vars_[i]);
     }
   }
  private:
   std::vector<PP_Var> vars_;
 };
 
 }  // namespace
 
+#ifdef ENABLE_PEPPER_THREADING
 TEST_F(PPB_VarTest, Threads) {
+#else
+TEST_F(PPB_VarTest, DISABLED_Threads) {
+#endif
   std::vector<base::PlatformThreadHandle> create_var_threads(kNumThreads);
   std::vector<CreateVarThreadDelegate> create_var_delegates;
   // The strings that the threads will re-extract from Vars (so we can check
   // that they match the original strings).
   std::vector<std::string> strings_out(kNumStrings);
   size_t strings_per_thread = kNumStrings/kNumThreads;
   // Give each thread an equal slice of strings to turn in to vars. (Except the
   // last thread may get fewer if kNumStrings is not evenly divisible by
   // kNumThreads).
   for (size_t slice_start= 0; slice_start < kNumStrings;
@@ skipping 54 matching lines @@
   for (size_t i = 0; i < kNumStrings; ++i) {
     uint32_t len = 10;
     const char* utf8 = ppb_var_->VarToUtf8(vars_[i], &len);
     EXPECT_EQ(NULL, utf8);
     EXPECT_EQ(0u, len);
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi