Remove plugin connection to PPAPI scriptable objects (var deprecated). Also

tests/fake_browser_ppapi/fake_host.cc

Index: tests/fake_browser_ppapi/fake_host.cc
===================================================================
--- tests/fake_browser_ppapi/fake_host.cc	(revision 6005)
+++ tests/fake_browser_ppapi/fake_host.cc	(working copy)
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2011 The Native Client 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 "native_client/tests/fake_browser_ppapi/fake_host.h"
-
-#if !NACL_WINDOWS
-# include <dlfcn.h>
-#endif  // !NACL_WINDOWS
-
-#include <string.h>
-#include "native_client/src/include/portability.h"
-#include "native_client/src/shared/platform/nacl_check.h"
-
-namespace {
-
-#if NACL_WINDOWS
-
-#define RTLD_NOW 0
-#define RTLD_LOCAL 0
-
-void* dlopen(const char* filename, int flag) {
-  return reinterpret_cast<void*>(LoadLibrary(filename));
-}
-
-void* dlsym(void *handle, const char* symbol_name) {
-  return GetProcAddress(reinterpret_cast<HMODULE>(handle), symbol_name);
-}
-
-int dlclose(void* handle) {
-  return !FreeLibrary(reinterpret_cast<HMODULE>(handle));
-}
-
-#endif
-
-}  // namespace
-
-
-namespace fake_browser_ppapi {
-
-Host::Host(const char* plugin_file)
-    : var_deprecated_interface_(NULL),
-      last_resource_id_(0),
-      last_instance_id_(0) {
-  dl_handle_ = dlopen(plugin_file, RTLD_NOW | RTLD_LOCAL);
-  CHECK(dl_handle_ != NULL);
-  initialize_module_ =
-      reinterpret_cast<InitializeModuleFunc>(
-        reinterpret_cast<uintptr_t>(dlsym(dl_handle_, "PPP_InitializeModule")));
-  CHECK(initialize_module_ != NULL);
-  shutdown_module_ =
-      reinterpret_cast<ShutdownModuleFunc>(
-        reinterpret_cast<uintptr_t>(dlsym(dl_handle_, "PPP_ShutdownModule")));
-  CHECK(shutdown_module_ != NULL);
-  get_interface_ =
-      reinterpret_cast<GetInterfaceFunc>(
-        reinterpret_cast<uintptr_t>(dlsym(dl_handle_, "PPP_GetInterface")));
-  CHECK(get_interface_ != NULL);
-}
-
-Host::~Host() {
-  int rc = dlclose(dl_handle_);
-  CHECK(rc == 0);
-
-  ResourceMap::iterator ri;
-  while ((ri = resource_map_.begin()) != resource_map_.end()) {
-    delete(ri->second);
-    resource_map_.erase(ri);
-  }
-
-  InstanceMap::iterator ii;
-  while ((ii = instance_map_.begin()) != instance_map_.end()) {
-    delete(ii->second);
-    instance_map_.erase(ii);
-  }
-}
-
-int32_t Host::InitializeModule(PP_Module module,
-                               PPB_GetInterface get_intf) {
-  return (*initialize_module_)(module, get_intf);
-}
-
-void Host::ShutdownModule() {
-  return (*shutdown_module_)();
-}
-
-const void* Host::GetInterface(const char* interface_name) {
-  return (*get_interface_)(interface_name);
-}
-
-PP_Resource Host::TrackResource(Resource* resource) {
-  PP_Resource resource_id = ++last_resource_id_;
-  resource_map_[resource_id] = resource;
-  resource->set_resource_id(resource_id);
-  return resource_id;
-}
-
-Resource* Host::GetResource(PP_Resource resource_id) {
-  ResourceMap::iterator iter = resource_map_.find(resource_id);
-  if (iter == resource_map_.end())
-    return Resource::Invalid();
-  return iter->second;
-}
-
-PP_Instance Host::TrackInstance(Instance* instance) {
-  PP_Instance instance_id = ++last_instance_id_;
-  instance_map_[instance_id] = instance;
-  instance->set_instance_id(instance_id);
-  return instance_id;
-}
-
-Instance* Host::GetInstance(PP_Instance instance_id) {
-  InstanceMap::iterator iter = instance_map_.find(instance_id);
-  if (iter == instance_map_.end())
-    return Instance::Invalid();
-  return iter->second;
-}
-
-}  // namespace fake_browser_ppapi