Pepper: Remove PPP_ManifestService.

ppapi/native_client/src/trusted/plugin/service_runtime.cc

 /*
  * Copyright (c) 2012 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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 33 matching lines @@
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h"
 #include "ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
 #include "ppapi/native_client/src/trusted/plugin/srpc_client.h"
 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 #include "ppapi/native_client/src/trusted/weak_ref/call_on_main_thread.h"
 
 namespace plugin {
 
-namespace {
-
-class ManifestService {
- public:
-  ManifestService(nacl::WeakRefAnchor* anchor,
-                  PluginReverseInterface* plugin_reverse)
-      : anchor_(anchor),
-        plugin_reverse_(plugin_reverse) {
-  }
-
-  ~ManifestService() {
-    anchor_->Unref();
-  }
-
-  bool Quit() {
-    delete this;
-    return false;
-  }
-
-  bool StartupInitializationComplete() {
-    // Release this instance if the ServiceRuntime is already destructed.
-    if (anchor_->is_abandoned()) {
-      delete this;
-      return false;
-    }
-
-    plugin_reverse_->StartupInitializationComplete();
-    return true;
-  }
-
-  static PP_Bool QuitTrampoline(void* user_data) {
-    return PP_FromBool(static_cast<ManifestService*>(user_data)->Quit());
-  }
-
-  static PP_Bool StartupInitializationCompleteTrampoline(void* user_data) {
-    return PP_FromBool(static_cast<ManifestService*>(user_data)->
-                       StartupInitializationComplete());
-  }
-
- private:
-  // Weak reference to check if plugin_reverse is legally accessible or not.
-  nacl::WeakRefAnchor* anchor_;
-  PluginReverseInterface* plugin_reverse_;
-
-  DISALLOW_COPY_AND_ASSIGN(ManifestService);
-};
-
-// Vtable to pass functions to LaunchSelLdr.
-const PPP_ManifestService kManifestServiceVTable = {
-  &ManifestService::QuitTrampoline,
-  &ManifestService::StartupInitializationCompleteTrampoline,
-};
-
-}  // namespace
-
 OpenManifestEntryResource::~OpenManifestEntryResource() {
 }
 
 PluginReverseInterface::PluginReverseInterface(
     nacl::WeakRefAnchor* anchor,
     Plugin* plugin,
     ServiceRuntime* service_runtime,
     pp::CompletionCallback init_done_cb,
     pp::CompletionCallback crash_cb)
       : anchor_(anchor),
@@ skipping 336 matching lines @@
       ErrorInfo error_info;
       error_info.SetReport(
           PP_NACL_ERROR_SEL_LDR_CREATE_LAUNCHER,
           "ServiceRuntime: failed to create sel_ldr launcher");
       plugin_->ReportLoadError(error_info);
     }
     pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
     return;
   }
 
-  ManifestService* manifest_service =
-      new ManifestService(anchor_->Ref(), rev_interface_);
   bool enable_dev_interfaces =
       GetNaClInterface()->DevInterfacesEnabled(plugin_->pp_instance());
 
   tmp_subprocess->Start(plugin_->pp_instance(),
                         main_service_runtime_,
                         params.url.c_str(),
                         &params.file_info,
                         params.uses_irt,
                         params.uses_ppapi,
                         uses_nonsfi_mode_,
                         enable_dev_interfaces,
                         params.enable_dyncode_syscalls,
                         params.enable_exception_handling,
                         params.enable_crash_throttling,
-                        &kManifestServiceVTable,
-                        manifest_service,
                         callback);
   subprocess_.reset(tmp_subprocess.release());
 }
 
 bool ServiceRuntime::WaitForSelLdrStart() {
   // Time to wait on condvar (for browser to create a new sel_ldr process on
   // our behalf). Use 6 seconds to be *fairly* conservative.
   //
   // On surfaway, the CallOnMainThread above may never get scheduled
   // to unblock this condvar, or the IPC reply from the browser to renderer
@@ skipping 196 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin