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

gpu/gpu_plugin/gpu_plugin_unittest.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.h"
 #include "gpu/np_utils/np_object_mock.h"
 #include "gpu/np_utils/np_plugin_object_factory_mock.h"
 #include "gpu/np_utils/np_plugin_object_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(O3D_IN_CHROME)
 #include "webkit/glue/plugins/nphostapi.h"
-#else
-#include "o3d/third_party/npapi/include/npfunctions.h"
-#endif
 
 #if defined(OS_LINUX)
 #define INITIALIZE_PLUGIN_FUNCS , &plugin_funcs_
 #else
 #define INITIALIZE_PLUGIN_FUNCS
 #endif
 
 using np_utils::MockPluginObject;
 using np_utils::PluginObject;
 using testing::_;
@@ skipping 271 matching lines @@
   int* result = NULL;
   EXPECT_EQ(NPERR_GENERIC_ERROR, plugin_funcs_.getvalue(
       &npp_, NPPVjavaClass, &result));
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_funcs_.destroy(&npp_, NULL));
 
   gpu_plugin::NP_Shutdown();
 }
 
 }  // namespace gpu_plugin