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

gpu/gpu_plugin/gpu_plugin_object_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/command_buffer/common/command_buffer_mock.h"
 #include "gpu/gpu_plugin/gpu_plugin_object.h"
 #include "gpu/command_buffer/service/gpu_processor_mock.h"
 #include "gpu/np_utils/np_browser_mock.h"
 #include "gpu/np_utils/dynamic_np_object.h"
 #include "gpu/np_utils/np_object_mock.h"
 #include "gpu/np_utils/np_object_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
-
-#if defined(O3D_IN_CHROME)
 #include "webkit/glue/plugins/nphostapi.h"
-#else
-#include "o3d/third_party/npapi/include/npfunctions.h"
-#endif
 
 using ::base::SharedMemory;
 using command_buffer::GPUProcessor;
 using command_buffer::MockCommandBuffer;
 using command_buffer::MockGPUProcessor;
 using np_utils::MockNPBrowser;
 using np_utils::NPBrowser;
 using np_utils::NPObjectPointer;
 using testing::_;
 using testing::DoAll;
@@ skipping 285 matching lines @@
   window.y = 10;
   window.width = 100;
   window.height = 200;
 
   plugin_object_->SetWindow(&window);
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_object_->Destroy(NULL));
 }
 
 }  // namespace gpu_plugin