Added facility to stub log and check. It is still not ideal but workable.

gpu/command_buffer/client/cmd_buffer_helper.cc

 // Copyright (c) 2009 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.
 
 // This file contains the implementation of the command buffer helper class.
 
 #include "../client/cmd_buffer_helper.h"
 #include "../common/command_buffer.h"
 
 namespace gpu {
@@ skipping 65 matching lines @@
 // in argument.
 void CommandBufferHelper::WaitForToken(int32 token) {
   // Return immediately if corresponding InsertToken failed.
   if (token < 0)
     return;
   if (last_token_read_ >= token) return;  // fast path.
   if (token > token_) return;  // we wrapped
   Flush();
   while (last_token_read_ < token) {
     if (get_ == put_) {
-      GPU_LOG(FATAL) << "Empty command buffer while waiting on a token.";
+      LOG(FATAL) << "Empty command buffer while waiting on a token.";
       return;
     }
     // Do not loop forever if the flush fails, meaning the command buffer reader
     // has shutdown.
     if (!Flush())
       return;
   }
 }
 
 // Waits for available entries, basically waiting until get >= put + count + 1.
 // It actually waits for contiguous entries, so it may need to wrap the buffer
 // around, adding noops. Thus this function may change the value of put_.
 // The function will return early if an error occurs, in which case the
 // available space may not be available.
 void CommandBufferHelper::WaitForAvailableEntries(int32 count) {
-  GPU_CHECK(count < entry_count_);
+  CHECK(count < entry_count_);
   if (put_ + count > entry_count_) {
     // There's not enough room between the current put and the end of the
     // buffer, so we need to wrap. We will add noops all the way to the end,
     // but we need to make sure get wraps first, actually that get is 1 or
     // more (since put will wrap to 0 after we add the noops).
     DCHECK_LE(1, put_);
     Flush();
     while (get_ > put_ || get_ == 0) {
       // Do not loop forever if the flush fails, meaning the command buffer
       // reader has shutdown.
@@ skipping 38 matching lines @@
   SynchronizeState(state);
   return static_cast<error::Error>(state.error);
 }
 
 void CommandBufferHelper::SynchronizeState(CommandBuffer::State state) {
   get_ = state.get_offset;
   last_token_read_ = state.token;
 }
 
 }  // namespace gpu