Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Unified Diff: gpu/command_buffer/service/program_manager_unittest.cc

Issue 10534173: GPU Program Caching (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index c0fad679a4a97da74c57c38beba93a50372670a4..a26f643fa961c61640c11b1d80edeed89944666e 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "gpu/command_buffer/common/gl_mock.h"
@@ -30,11 +31,13 @@ using ::testing::StrEq;
using ::testing::StrictMock;
namespace gpu {
+class ShaderCache;
+
namespace gles2 {
class ProgramManagerTest : public testing::Test {
public:
- ProgramManagerTest() { }
+ ProgramManagerTest() : manager_(base::WeakPtr<ShaderCache>()) { }
~ProgramManagerTest() {
manager_.Destroy(false);
}
@@ -144,7 +147,7 @@ TEST_F(ProgramManagerTest, SwizzleLocation) {
class ProgramManagerWithShaderTest : public testing::Test {
public:
ProgramManagerWithShaderTest()
- : program_info_(NULL) {
+ : manager_(base::WeakPtr<ShaderCache>()), program_info_(NULL) {
}
~ProgramManagerWithShaderTest() {

Powered by Google App Engine
This is Rietveld 408576698