Index: gpu/config/gpu_info_collector_unittest.cc |
diff --git a/gpu/config/gpu_info_collector_unittest.cc b/gpu/config/gpu_info_collector_unittest.cc |
index 3e35d00d2369cd8361ea5d7deebbd4f88daae149..cb3229ee14e1b394828b888c7bbe828070cb69ff 100644 |
--- a/gpu/config/gpu_info_collector_unittest.cc |
+++ b/gpu/config/gpu_info_collector_unittest.cc |
@@ -2,13 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "gpu/config/gpu_info_collector.h" |
no sievers
2016/04/05 19:02:42
leave below
Mostyn Bramley-Moore
2016/04/05 21:35:32
Fixed.
|
+ |
#include <stddef.h> |
#include <stdint.h> |
-#include "base/memory/scoped_ptr.h" |
+#include <memory> |
+ |
#include "base/strings/string_split.h" |
#include "gpu/config/gpu_info.h" |
-#include "gpu/config/gpu_info_collector.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gl/gl_implementation.h" |
@@ -173,7 +175,7 @@ class GPUInfoCollectorTest |
public: |
// Use StrictMock to make 100% sure we know how GL will be called. |
- scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_; |
+ std::unique_ptr<::testing::StrictMock<::gfx::MockGLInterface>> gl_; |
GPUInfo test_values_; |
const char* gl_shading_language_version_ = nullptr; |