Cleanup: Remove base::environment_vector and base::file_handle_mapping_vector to StudlyCaps.

chrome/browser/nacl_host/nacl_process_host.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.
 
-#include "build/build_config.h"
-
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 
-#if defined(OS_POSIX)
-#include <fcntl.h>
-#endif
+#include <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/child_process_host.h"
 #include "ipc/ipc_switches.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 
 #if defined(OS_POSIX)
+#include <fcntl.h>
+
 #include "ipc/ipc_channel_posix.h"
 #elif defined(OS_WIN)
+#include <windows.h>
+
 #include "base/threading/thread.h"
 #include "base/process_util.h"
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #include "native_client/src/trusted/service_runtime/win/debug_exception_handler.h"
-#include <windows.h>
 #endif
 
 using content::BrowserThread;
 using content::ChildProcessData;
 using content::ChildProcessHost;
 
 #if defined(OS_WIN)
 class NaClProcessHost::DebugContext
   : public base::RefCountedThreadSafe<NaClProcessHost::DebugContext> {
  public:
@@ skipping 355 matching lines @@
   // On Windows we might need to start the broker process to launch a new loader
 #if defined(OS_WIN)
   if (RunningOnWOW64()) {
     return NaClBrokerService::GetInstance()->LaunchLoader(
         this, ASCIIToWide(channel_id));
   } else {
     process_->Launch(FilePath(), cmd_line);
   }
 #elif defined(OS_POSIX)
   process_->Launch(nacl_loader_prefix.empty(),  // use_zygote
-                   base::environment_vector(),
+                   base::EnvironmentVector(),
                    cmd_line);
 #endif
 
   return true;
 }
 
 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
   process_->SetHandle(handle);
   OnProcessLaunched();
 }
@@ skipping 299 matching lines @@
   process_->Send(new NaClProcessMsg_Start(handles_for_sel_ldr));
 #endif
 
   internal_->sockets_for_sel_ldr.clear();
 }
 
 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
   NOTREACHED() << "Invalid message with type = " << msg.type();
   return false;
 }