Revert 186416

gpu/command_buffer/service/query_manager_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 "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
@@ skipping 80 matching lines @@
     MockCommandBufferEngine() {
       data_.reset(new int8[kSharedBufferSize]);
       ClearSharedMemory();
       valid_buffer_.ptr = data_.get();
       valid_buffer_.size = kSharedBufferSize;
     }
 
     virtual ~MockCommandBufferEngine() {
     }
 
-    virtual gpu::Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE {
+    virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE {
       return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
     }
 
     void ClearSharedMemory() {
       memset(data_.get(), kInitialMemoryValue, kSharedBufferSize);
     }
 
     virtual void set_token(int32 token) OVERRIDE {
       DCHECK(false);
     }
@@ skipping 10 matching lines @@
     }
 
     // Overridden from CommandBufferEngine.
     virtual int32 GetGetOffset() OVERRIDE {
       DCHECK(false);
       return 0;
     }
 
    private:
     scoped_array<int8> data_;
-    gpu::Buffer valid_buffer_;
-    gpu::Buffer invalid_buffer_;
+    Buffer valid_buffer_;
+    Buffer invalid_buffer_;
   };
 
   scoped_ptr<MockCommandBufferEngine> engine_;
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const int32 QueryManagerTest::kSharedMemoryId;
 const size_t QueryManagerTest::kSharedBufferSize;
 const uint32 QueryManagerTest::kSharedMemoryOffset;
@@ skipping 417 matching lines @@
 
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
 
   manager->Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu