Pepper: Simplify error reporting in PnaclResources.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h

 // 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.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_
 
 #include <set>
 #include <map>
 #include <vector>
@@ skipping 51 matching lines @@
   static PnaclCoordinator* BitcodeToNative(
       Plugin* plugin,
       const nacl::string& pexe_url,
       const PP_PNaClOptions& pnacl_options,
       const pp::CompletionCallback& translate_notify_callback);
 
   // Call this to take ownership of the FD of the translated nexe after
   // BitcodeToNative has completed (and the finish_callback called).
   PP_FileHandle TakeTranslatedFileHandle();
 
-  // Run |translate_notify_callback_| with an error condition that is not
-  // PPAPI specific.  Also set ErrorInfo report.
-  void ReportNonPpapiError(PP_NaClError err, const nacl::string& message);
-  // Run when faced with a PPAPI error condition. Bring control back to the
-  // plugin by invoking the |translate_notify_callback_|.
-  // Also set ErrorInfo report.
-  void ReportPpapiError(PP_NaClError err,
-                        int32_t pp_error, const nacl::string& message);
-  // Bring control back to the plugin by invoking the
-  // |translate_notify_callback_|.  This does not set the ErrorInfo report,
-  // it is assumed that it was already set.
-  void ExitWithError();
-
   // Implement FileDownloader's template of the CallbackSource interface.
   // This method returns a callback which will be called by the FileDownloader
   // to stream the bitcode data as it arrives. The callback
   // (BitcodeStreamGotData) passes it to llc over SRPC.
   StreamCallback GetCallback();
 
   // Return a callback that should be notified when |bytes_compiled| bytes
   // have been compiled.
   pp::CompletionCallback GetCompileProgressCallback(int64_t bytes_compiled);
 
@@ skipping 56 matching lines @@
   // Invoked when translation is finished.
   void TranslateFinished(int32_t pp_error);
 
   // Invoked when the read descriptor for nexe_file_ is created.
   void NexeReadDidOpen(int32_t pp_error);
 
   // Invoked when a UMA timing measurement from the translate thread is ready.
   void DoUMATimeMeasure(
       int32_t pp_error, const nacl::string& event_name, int64_t microsecs);
 
+  // Bring control back to the plugin by invoking the
+  // |translate_notify_callback_|.  This does not set the ErrorInfo report,
+  // it is assumed that it was already set.
+  void ExitWithError();
+  // Run |translate_notify_callback_| with an error condition that is not
+  // PPAPI specific.  Also set ErrorInfo report.
+  void ReportNonPpapiError(PP_NaClError err, const nacl::string& message);
+  // Run when faced with a PPAPI error condition. Bring control back to the
+  // plugin by invoking the |translate_notify_callback_|.
+  // Also set ErrorInfo report.
+  void ReportPpapiError(PP_NaClError err,
+                        int32_t pp_error, const nacl::string& message);
+
+
   // Keeps track of the pp_error upon entry to TranslateFinished,
   // for inspection after cleanup.
   int32_t translate_finish_error_;
 
   // The plugin owning the nexe for which we are doing translation.
   Plugin* plugin_;
 
   pp::CompletionCallback translate_notify_callback_;
   // Set to true when the translation (if applicable) is finished and the nexe
   // file is loaded, (or when there was an error), and the browser has been
@@ skipping 49 matching lines @@
   // The helper thread used to do translations via SRPC.
   // It accesses fields of PnaclCoordinator so it must have a
   // shorter lifetime.
   nacl::scoped_ptr<PnaclTranslateThread> translate_thread_;
 };
 
 //----------------------------------------------------------------------
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_