Revert of Add creation of ServiceManager to Content

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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/gles2/command_buffer_client_impl.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
@@ skipping 73 matching lines @@
   TryUpdateState();
   while (!InRange(start, end, last_state_.token) &&
          last_state_.error == gpu::error::kNoError) {
     MakeProgressAndUpdateState();
     TryUpdateState();
   }
 }
 
 void CommandBufferClientImpl::WaitForGetOffsetInRange(int32 start, int32 end) {
   TryUpdateState();
-  while (!InRange(start, end, last_state_.token) &&
+  while (!InRange(start, end, last_state_.get_offset) &&
          last_state_.error == gpu::error::kNoError) {
     MakeProgressAndUpdateState();
     TryUpdateState();
   }
 }
 
 void CommandBufferClientImpl::SetGetBuffer(int32 shm_id) {
   command_buffer_->SetGetBuffer(shm_id);
   last_put_offset_ = -1;
 }
@@ skipping 171 matching lines @@
     return;
   }
 }
 
 void CommandBufferClientImpl::DrawAnimationFrame() {
   delegate_->DrawAnimationFrame();
 }
 
 }  // namespace gles2
 }  // namespace mojo