Replaced BaseNPObject with DefaultNPObject because......

o3d/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 "o3d/gpu_plugin/gpu_plugin.h"
 #include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/np_utils/base_np_object_mock.h"
+#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
 #include "o3d/gpu_plugin/np_utils/np_plugin_object_factory_mock.h"
 #include "o3d/gpu_plugin/np_utils/np_plugin_object_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/plugins/nphostapi.h"
 
 #if defined(OS_LINUX)
 #define INITIALIZE_PLUGIN_FUNCS , &plugin_funcs_
 #else
 #define INITIALIZE_PLUGIN_FUNCS
 #endif
@@ skipping 10 matching lines @@
 
 class GPUPluginTest : public testing::Test {
  protected:
   virtual void SetUp() {
     memset(&npp_, 0, sizeof(npp_));
     memset(&browser_funcs_, 0, sizeof(browser_funcs_));
     memset(&plugin_funcs_, 0, sizeof(plugin_funcs_));
 
     plugin_object_factory_ = new StrictMock<MockPluginObjectFactory>;
 
-    np_class_ = BaseNPObject::GetNPClass<StrictMock<MockBaseNPObject> >();
+    np_class_ = NPGetClass<StrictMock<MockNPObject> >();
   }
 
   virtual void TearDown() {
     delete plugin_object_factory_;
   }
 
   NPP_t npp_;
   NPNetscapeFuncs browser_funcs_;
   NPPluginFuncs plugin_funcs_;
   MockPluginObjectFactory* plugin_object_factory_;
@@ skipping 243 matching lines @@
   EXPECT_EQ(NPERR_GENERIC_ERROR, plugin_funcs_.getvalue(
       &npp_, NPPVjavaClass, &result));
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_funcs_.destroy(&npp_, NULL));
 
   NP_Shutdown();
 }
 
 }  // namespace gpu_plugin
 }  // namespace o3d