convert //gpu to std::unique_ptr

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 <stddef.h>
 #include <stdint.h>
 

[no sievers, 2016/04/05 19:02:41]

#include <memory>

[Mostyn Bramley-Moore, 2016/04/05 21:35:31]

Done.

 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.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/gpu_service_test.h"
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 72 matching lines @@
     EXPECT_CALL(*gl_, BeginQuery(query->target(), service_id))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_CALL(*gl_, EndQuery(query->target()))
         .Times(1)
         .RetiresOnSaturation();
     EXPECT_TRUE(manager_->BeginQuery(query));
     EXPECT_TRUE(manager_->EndQuery(query, submit_count));
   }
 
-  scoped_ptr<MockGLES2Decoder> decoder_;
-  scoped_ptr<QueryManager> manager_;
+  std::unique_ptr<MockGLES2Decoder> decoder_;
+  std::unique_ptr<QueryManager> manager_;
 
  private:
   class MockCommandBufferEngine : public CommandBufferEngine {
    public:
     MockCommandBufferEngine() {
-      scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
+      std::unique_ptr<base::SharedMemory> shared_memory(
+          new base::SharedMemory());
       shared_memory->CreateAndMapAnonymous(kSharedBufferSize);
       valid_buffer_ = MakeBufferFromSharedMemory(std::move(shared_memory),
                                                  kSharedBufferSize);
 
-      scoped_ptr<base::SharedMemory> shared_memory2(new base::SharedMemory());
+      std::unique_ptr<base::SharedMemory> shared_memory2(
+          new base::SharedMemory());
       shared_memory2->CreateAndMapAnonymous(kSharedBufferSize);
       valid_buffer2_ = MakeBufferFromSharedMemory(std::move(shared_memory2),
                                                   kSharedBufferSize);
 
       ClearSharedMemory();
     }
 
     ~MockCommandBufferEngine() override {}
 
     scoped_refptr<gpu::Buffer> GetSharedMemoryBuffer(int32_t shm_id) override {
@@ skipping 27 matching lines @@
       DCHECK(false);
       return 0;
     }
 
    private:
     scoped_refptr<gpu::Buffer> valid_buffer_;
     scoped_refptr<gpu::Buffer> valid_buffer2_;
     scoped_refptr<gpu::Buffer> invalid_buffer_;
   };
 
-  scoped_ptr<MockCommandBufferEngine> engine_;
+  std::unique_ptr<MockCommandBufferEngine> engine_;
 };
 
 class QueryManagerManualSetupTest : public QueryManagerTest {
  protected:
   void SetUp() override {
     // Let test setup manually.
   }
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
@@ skipping 332 matching lines @@
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLenum kTarget = GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
 
   TestHelper::SetupFeatureInfoInitExpectations(
       gl_.get(),
       "GL_ARB_occlusion_query2");
   scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
   feature_info->InitializeForTesting();
-  scoped_ptr<QueryManager> manager(
+  std::unique_ptr<QueryManager> manager(
       new QueryManager(decoder_.get(), feature_info.get()));
 
   EXPECT_CALL(*gl_, GenQueries(1, _))
       .WillOnce(SetArgumentPointee<1>(kService1Id))
       .RetiresOnSaturation();
   QueryManager::Query* query = manager->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
   ASSERT_TRUE(query != NULL);
 
   EXPECT_CALL(*gl_, BeginQuery(GL_ANY_SAMPLES_PASSED_EXT, kService1Id))
@@ skipping 13 matching lines @@
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLenum kTarget = GL_ANY_SAMPLES_PASSED_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
 
   TestHelper::SetupFeatureInfoInitExpectations(
       gl_.get(),
       "GL_ARB_occlusion_query");
   scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
   feature_info->InitializeForTesting();
-  scoped_ptr<QueryManager> manager(
+  std::unique_ptr<QueryManager> manager(
       new QueryManager(decoder_.get(), feature_info.get()));
 
   EXPECT_CALL(*gl_, GenQueries(1, _))
       .WillOnce(SetArgumentPointee<1>(kService1Id))
       .RetiresOnSaturation();
   QueryManager::Query* query = manager->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
   ASSERT_TRUE(query != NULL);
 
   EXPECT_CALL(*gl_, BeginQuery(GL_SAMPLES_PASSED_ARB, kService1Id))
@@ skipping 12 matching lines @@
   const GLuint kService1Id = 11;
   const GLuint kService2Id = 12;
   const GLenum kTarget = GL_ANY_SAMPLES_PASSED_EXT;
   const base::subtle::Atomic32 kSubmitCount = 123;
 
   TestHelper::SetupFeatureInfoInitExpectations(
       gl_.get(),
       "GL_ARB_occlusion_query");
   scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
   feature_info->InitializeForTesting();
-  scoped_ptr<QueryManager> manager(
+  std::unique_ptr<QueryManager> manager(
       new QueryManager(decoder_.get(), feature_info.get()));
 
   EXPECT_CALL(*gl_, GenQueries(1, _))
       .WillOnce(SetArgumentPointee<1>(kService1Id))
       .RetiresOnSaturation();
   QueryManager::Query* query = manager->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
   ASSERT_TRUE(query != NULL);
 
   EXPECT_CALL(*gl_, BeginQuery(GL_SAMPLES_PASSED_ARB, kService1Id))
@@ skipping 322 matching lines @@
 }
 
 TEST_F(QueryManagerTest, GetErrorQuery) {
   const GLuint kClient1Id = 1;
   const GLenum kTarget = GL_GET_ERROR_QUERY_CHROMIUM;
   const base::subtle::Atomic32 kSubmitCount = 123;
 
   TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), "");
   scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
   feature_info->InitializeForTesting();
-  scoped_ptr<QueryManager> manager(
+  std::unique_ptr<QueryManager> manager(
       new QueryManager(decoder_.get(), feature_info.get()));
 
   QueryManager::Query* query = manager->CreateQuery(
       kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
   ASSERT_TRUE(query != NULL);
 
   // Setup shared memory like client would.
   QuerySync* sync = decoder_->GetSharedMemoryAs<QuerySync*>(
       kSharedMemoryId, kSharedMemoryOffset, sizeof(*sync));
   ASSERT_TRUE(sync != NULL);
@@ skipping 13 matching lines @@
 
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result);
 
   manager->Destroy(false);
 }
 
 }  // namespace gles2
 }  // namespace gpu