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

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

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/shader_manager_unittest.cc
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc
index 2de9a58c583adc7ce7729c7a264c7984d37c7f66..0971bf16f2616ba2b41076bf8aef12b1a5429fd5 100644
--- a/gpu/command_buffer/service/shader_manager_unittest.cc
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc
@@ -88,13 +88,13 @@ TEST_F(ShaderManagerTest, DeleteBug) {
manager_.CreateShader(kClient1Id, kService1Id, kShaderType));
scoped_refptr<Shader> shader2(
manager_.CreateShader(kClient2Id, kService2Id, kShaderType));
- ASSERT_TRUE(shader1);
- ASSERT_TRUE(shader2);
- manager_.UseShader(shader1);
- manager_.MarkAsDeleted(shader1);
- manager_.MarkAsDeleted(shader2);
- EXPECT_TRUE(manager_.IsOwned(shader1));
- EXPECT_FALSE(manager_.IsOwned(shader2));
+ ASSERT_TRUE(shader1.get());
+ ASSERT_TRUE(shader2.get());
+ manager_.UseShader(shader1.get());
+ manager_.MarkAsDeleted(shader1.get());
+ manager_.MarkAsDeleted(shader2.get());
+ EXPECT_TRUE(manager_.IsOwned(shader1.get()));
+ EXPECT_FALSE(manager_.IsOwned(shader2.get()));
}
TEST_F(ShaderManagerTest, Shader) {
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698