Mojo: AsyncWaiter and mojo/public/environment

mojo/public/bindings/lib/buffer.cc

 // Copyright 2013 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 "mojo/public/bindings/lib/buffer.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "mojo/public/bindings/lib/bindings_serialization.h"
-#include "mojo/public/bindings/lib/bindings_support.h"
+#include "mojo/public/environment/buffer_tls.h"
 
 // Scrub memory in debug builds to help catch use-after-free bugs.
 #ifdef NDEBUG
 #define DEBUG_SCRUB(address, size) (void) (address), (void) (size)
 #else
 #define DEBUG_SCRUB(address, size) memset(address, 0xCD, size)
 #endif
 
 namespace mojo {
 
 //-----------------------------------------------------------------------------
 
 Buffer::Buffer() {
-  previous_ = BindingsSupport::Get()->SetCurrentBuffer(this);
+  previous_ = internal::SetCurrentBuffer(this);
 }
 
 Buffer::~Buffer() {
-  Buffer* buf MOJO_ALLOW_UNUSED =
-      BindingsSupport::Get()->SetCurrentBuffer(previous_);
+  Buffer* buf MOJO_ALLOW_UNUSED = internal::SetCurrentBuffer(previous_);
   assert(buf == this);
 }
 
 Buffer* Buffer::current() {
-  return BindingsSupport::Get()->GetCurrentBuffer();
+  return internal::GetCurrentBuffer();
 }
 
 //-----------------------------------------------------------------------------
 
 namespace internal {
 
 ScratchBuffer::ScratchBuffer()
     : overflow_(NULL) {
   fixed_.next = NULL;
   fixed_.cursor = fixed_data_;
@@ skipping 98 matching lines @@
 void* FixedBuffer::Leak() {
   char* ptr = ptr_;
   ptr_ = NULL;
   cursor_ = 0;
   size_ = 0;
   return ptr;
 }
 
 }  // namespace internal
 }  // namespace mojo