diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 04:40:20 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 04:40:20 +0000 |
| commit | a82af39780861fe06a8682791a0ac477fb167531 (patch) | |
| tree | cca259d368103813583118654c37da99ab8fb6b0 /chrome/browser/nacl_host | |
| parent | fd170bb31f6438e7472d76805aa67cb9d409aa55 (diff) | |
| download | chromium_src-a82af39780861fe06a8682791a0ac477fb167531.zip chromium_src-a82af39780861fe06a8682791a0ac477fb167531.tar.gz chromium_src-a82af39780861fe06a8682791a0ac477fb167531.tar.bz2 | |
Cleanup: Remove base::environment_vector and base::file_handle_mapping_vector to StudlyCaps.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9429039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host')
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 88bd946..baa6904 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -2,13 +2,10 @@ // 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" @@ -17,6 +14,7 @@ #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" @@ -31,13 +29,16 @@ #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; @@ -413,7 +414,7 @@ bool NaClProcessHost::LaunchSelLdr() { } #elif defined(OS_POSIX) process_->Launch(nacl_loader_prefix.empty(), // use_zygote - base::environment_vector(), + base::EnvironmentVector(), cmd_line); #endif |