Replaced BaseNPObject with DefaultNPObject because......

o3d/gpu_plugin/np_utils/np_object_mock.h

Index: o3d/gpu_plugin/np_utils/np_object_mock.h
===================================================================
--- o3d/gpu_plugin/np_utils/np_object_mock.h	(revision 24889)
+++ o3d/gpu_plugin/np_utils/np_object_mock.h	(working copy)
@@ -2,29 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef O3D_GPU_PLUGIN_NP_UTILS_BASE_NP_OBJECT_MOCK_H_
-#define O3D_GPU_PLUGIN_NP_UTILS_BASE_NP_OBJECT_MOCK_H_
+#ifndef O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_
+#define O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_
 
-#include "o3d/gpu_plugin/np_utils/base_np_object.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace o3d {
 namespace gpu_plugin {
 
-class MockBaseNPObject : public BaseNPObject {
+class MockNPObject : public NPObject {
  public:
-  explicit MockBaseNPObject(NPP npp) : BaseNPObject(npp) {
-    ++count_;
+  explicit MockNPObject(NPP npp) {
   }
 
-  ~MockBaseNPObject() {
-    --count_;
-  }
-
-  static int count() {
-    return count_;
-  }
-
   MOCK_METHOD0(Invalidate, void());
   MOCK_METHOD1(HasMethod, bool(NPIdentifier));
   MOCK_METHOD4(Invoke,
@@ -38,10 +30,10 @@
   MOCK_METHOD3(Construct, bool(const NPVariant*, uint32_t, NPVariant*));
 
  private:
-  static int count_;
+  DISALLOW_COPY_AND_ASSIGN(MockNPObject);
 };
 
 }  // namespace gpu_plugin
 }  // namespace o3d
 
-#endif  // O3D_GPU_PLUGIN_NP_UTILS_BASE_NP_OBJECT_MOCK_H_
+#endif  // O3D_GPU_PLUGIN_NP_UTILS_NP_OBJECT_MOCK_H_