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

gpu/np_utils/np_browser.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/np_utils/np_browser.h"
 #include "base/logging.h"
-
-#if defined(O3D_IN_CHROME)
 #include "webkit/glue/plugins/nphostapi.h"
-#else
-#include "o3d/third_party/npapi/include/npfunctions.h"
-#endif
 
 namespace np_utils {
 
 NPBrowser* NPBrowser::browser_;
 
 NPBrowser::NPBrowser(NPNetscapeFuncs* funcs)
     : netscape_funcs_(funcs) {
   // Make this the first browser in the linked list.
   previous_browser_ = browser_;
   browser_ = this;
@@ skipping 96 matching lines @@
                                 bool repeat,
                                 TimerProc callback) {
   return netscape_funcs_->scheduletimer(npp, interval, repeat, callback);
 }
 
 void NPBrowser::UnscheduleTimer(NPP npp, uint32 timer_id) {
   netscape_funcs_->unscheduletimer(npp, timer_id);
 }
 
 }  // namespace np_utils