Remove 13 exit time constructors and 3 static initializers

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

 // Copyright (c) 2011 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 "native_client/src/trusted/plugin/pnacl_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
@@ skipping 391 matching lines @@
   }
 }
 
 //////////////////////////////////////////////////////////////////////
 // Helper functions for loading native libs.
 // Done here to avoid hacking on the manifest parser further...
 
 namespace {
 
 // Fake filename for the object file generated by llvm.
-const nacl::string kGeneratedObjectFileName =
-    nacl::string("___PNACL_GENERATED");
+nacl::string kGeneratedObjectFileName() {

[Mark Mentovai, 2011/11/06 14:09:02]

No longer a constant, get rid of the k.

[Nico, 2011/11/06 17:30:38]

Done.

+  return nacl::string("___PNACL_GENERATED");
+}
 
 string_vector LinkResources(const nacl::string& sandbox_isa,
                             bool withGenerated) {
   string_vector results;
   nacl::string base_dir = "pnacl_support/" + sandbox_isa;
 
   // NOTE: order of items == link order.
   if (withGenerated) {
-    results.push_back(kGeneratedObjectFileName);
+    results.push_back(kGeneratedObjectFileName());
   }
   results.push_back(base_dir + "/libcrt_platform.a");
   results.push_back(base_dir + "/libgcc.a");
   results.push_back(base_dir + "/libgcc_eh.a");
   return results;
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////
@@ skipping 72 matching lines @@
                                         ld_subprocess,
                                         "AddArg",
                                         "C",
                                         &dummy_params,
                                         link_file.c_str())) {
       AbortLinkThread(p,
                       "PnaclCoordinator linker AddArg(" +
                       link_file + ") failed.");
     }
     // Also map the file name to descriptor.
-    if (i->compare(kGeneratedObjectFileName) == 0) {
+    if (i->compare(kGeneratedObjectFileName()) == 0) {
       SrpcParams dummy_params2;
       if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
                                           ld_subprocess,
                                           "AddFileWithSize",
                                           "Chi",
                                           &dummy_params2,
                                           link_file.c_str(),
                                           p->obj_wrapper->desc(),
                                           p->obj_len)) {
         AbortLinkThread(p,
@@ skipping 222 matching lines @@
   // Finally, actually schedule the downloads.
   for (size_t i = 0; i < downloads.size(); ++i) {
     if (!ScheduleDownload(downloads[i].first, downloads[i].second)) {
       break;  // error should have been reported by ScheduleDownload.
     }
   }
   downloads.clear();
 }
 
 }  // namespace plugin