Branched gpu process and command buffer code into Chrome tree. Fixed up paths...

gpu/gpu_plugin/gpu_plugin.cc

 // Copyright (c) 2006-2008 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.
 
 #include "gpu/gpu_plugin/gpu_plugin.h"
 #include "gpu/gpu_plugin/gpu_plugin_object_factory.h"
 #include "gpu/np_utils/np_browser.h"
 #include "gpu/np_utils/np_plugin_object.h"
 #include "gpu/np_utils/np_plugin_object_factory.h"
-
-#if defined(O3D_IN_CHROME)
 #include "webkit/glue/plugins/nphostapi.h"
-#else
-#include "o3d/third_party/npapi/include/npfunctions.h"
-#endif
 
 using np_utils::NPBrowser;
 using np_utils::NPPluginObjectFactory;
 using np_utils::PluginObject;
 
 namespace gpu_plugin {
 
 // Definitions of NPAPI plugin entry points.
 
 namespace {
@@ skipping 105 matching lines @@
 NPError NP_Shutdown() {
   if (!g_browser)
     return NPERR_GENERIC_ERROR;
 
   delete g_browser;
   g_browser = NULL;
 
   return NPERR_NO_ERROR;
 }
 }  // namespace gpu_plugin