Remove WebGraphicsContext3D dependency in gpu_context_tests.h

content/common/gpu/client/gpu_context_tests.h

 // Copyright 2013 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.
 
 // These tests are run twice:
 // Once in a gpu test with an in-process WebGraphicsContext3D.
 // Once in a browsertest with a gpu-process WebGraphicsContext3D.
 
 #include "base/bind.h"
 #include "base/run_loop.h"
@@ skipping 13 matching lines @@
   }
 
   // These tests should time out if the callback doesn't get called.
   void TestSignalSyncToken(const gpu::SyncToken& sync_token) {
     base::RunLoop run_loop;
     context_support_->SignalSyncToken(sync_token, run_loop.QuitClosure());
     run_loop.Run();
   }
 
   // These tests should time out if the callback doesn't get called.
-  void TestSignalQuery(blink::WebGLId query) {
+  void TestSignalQuery(GLuint query) {
     base::RunLoop run_loop;
     context_support_->SignalQuery(
         query,
         base::Bind(
             &RunOnlyOnce, run_loop.QuitClosure(), base::Owned(new int(0))));
     run_loop.Run();
   }
 };
 
 CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) {
-  if (!context_)
-    return;
-
-  const blink::WGC3Duint64 fence_sync = context_->insertFenceSyncCHROMIUM();
-  context_->GetGLInterface()->ShallowFlushCHROMIUM();
+  const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
+  gl_->ShallowFlushCHROMIUM();
 
   gpu::SyncToken sync_token;
-  ASSERT_TRUE(context_->genSyncTokenCHROMIUM(fence_sync, sync_token.GetData()));
+  gl_->GenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 
   TestSignalSyncToken(sync_token);
 };
 
 CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) {
-  if (!context_)
-    return;
-
   // Signalling something that doesn't exist should run the callback
   // immediately.
   gpu::SyncToken sync_token;
   TestSignalSyncToken(sync_token);
 };
 
 CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) {
-  if (!context_)
-    return;
-
   // Signalling something that doesn't exist should run the callback
   // immediately.
   gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                             gpu::CommandBufferId::FromUnsafeValue(1297824234),
                             9123743439);
   TestSignalSyncToken(sync_token);
 };
 
 CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) {
-  if (!context_)
-    return;
-
-  unsigned query = context_->createQueryEXT();
-  context_->beginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query);
-  context_->finish();
-  context_->endQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
+  unsigned query;
+  gl_->GenQueriesEXT(1, &query);
+  gl_->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query);
+  gl_->Finish();
+  gl_->EndQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
   TestSignalQuery(query);
-  context_->deleteQueryEXT(query);
+  gl_->DeleteQueriesEXT(1, &query);
 };
 
 CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) {
-  if (!context_)
-    return;
-
-  blink::WebGLId query = context_->createQueryEXT();
+  GLuint query;
+  gl_->GenQueriesEXT(1, &query);
   TestSignalQuery(query);
-  context_->deleteQueryEXT(query);
+  gl_->DeleteQueriesEXT(1, &query);
 };
 
 CONTEXT_TEST_F(SignalTest, InvalidSignalQueryUnboundTest) {
-  if (!context_)
-    return;
-
   // Signalling something that doesn't exist should run the callback
   // immediately.
   TestSignalQuery(928729087);
   TestSignalQuery(928729086);
   TestSignalQuery(928729085);
   TestSignalQuery(928729083);
   TestSignalQuery(928729082);
   TestSignalQuery(928729081);
 };
 
 };