Removed command buffer's last dependency on NPAPI....

gpu/command_buffer/client/gles2_demo.cc

 // Copyright (c) 2006-2009 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.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #include <windows.h>
 #include <windowsx.h>
 #include <shellapi.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/scoped_ptr.h"
 #include "gpu/command_buffer/service/gpu_processor.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
-#include "gpu/np_utils/np_utils.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/gles2_demo_c.h"
 #include "gpu/command_buffer/client/gles2_demo_cc.h"
 
 using base::SharedMemory;
 using command_buffer::GPUProcessor;
 using command_buffer::CommandBufferService;
 using command_buffer::gles2::GLES2CmdHelper;
 using command_buffer::gles2::GLES2Implementation;
 
 class GLES2Demo {
  public:
   GLES2Demo();
 
-  bool GLES2Demo::Setup(NPP npp, void* hwnd, int32 size);
+  bool GLES2Demo::Setup(void* hwnd, int32 size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Demo);
 };
 
 GLES2Demo::GLES2Demo() {
 }
 
-bool GLES2Demo::Setup(NPP npp, void* hwnd, int32 size) {
+bool GLES2Demo::Setup(void* hwnd, int32 size) {
   scoped_ptr<SharedMemory> ring_buffer(new SharedMemory);
   if (!ring_buffer->Create(std::wstring(), false, false, size)) {
     return NULL;
   }
 
   if (!ring_buffer->Map(size)) {
     return NULL;
   }
 
   scoped_ptr<CommandBufferService> command_buffer(new CommandBufferService);
   if (!command_buffer->Initialize(ring_buffer.release())) {
     return NULL;
   }
 
   scoped_refptr<GPUProcessor> gpu_processor(
-      new GPUProcessor(npp, command_buffer.get()));
+      new GPUProcessor(command_buffer.get()));
   if (!gpu_processor->Initialize(reinterpret_cast<HWND>(hwnd))) {
     return NULL;
   }
 
   command_buffer->SetPutOffsetChangeCallback(
       NewCallback(gpu_processor.get(), &GPUProcessor::ProcessCommands));
 
   GLES2CmdHelper* helper = new GLES2CmdHelper(command_buffer.get());
   if (!helper->Initialize()) {
     // TODO(gman): cleanup.
@@ skipping 124 matching lines @@
 int main(int argc, const char** argv) {
   const int32 kCommandBufferSize = 1024 * 1024;
   GLES2Demo* demo = new GLES2Demo();
 
   void* hwnd = SetupWindow();
   if (!hwnd) {
     ::fprintf(stdout, "Could not setup window.\n");
     return EXIT_FAILURE;
   }
 
-  demo->Setup(NULL, hwnd, kCommandBufferSize);
+  demo->Setup(hwnd, kCommandBufferSize);
 
   ProcessMessages(hwnd);
 
   return EXIT_SUCCESS;
 }