Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Side by Side Diff: chrome/browser/zygote_host_linux.cc

Issue 3052034: base: Rename EnvVarGetter to Environment. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: review Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/zygote_host_linux.h" 5 #include "chrome/browser/zygote_host_linux.h"
6 6
7 #include <sys/socket.h> 7 #include <sys/socket.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/eintr_wrapper.h" 13 #include "base/eintr_wrapper.h"
14 #include "base/env_var.h" 14 #include "base/environment.h"
15 #include "base/linux_util.h" 15 #include "base/linux_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/pickle.h" 18 #include "base/pickle.h"
19 #include "base/process_util.h" 19 #include "base/process_util.h"
20 #include "base/string_number_conversions.h" 20 #include "base/string_number_conversions.h"
21 #include "base/string_util.h" 21 #include "base/string_util.h"
22 #include "base/scoped_ptr.h" 22 #include "base/scoped_ptr.h"
23 #include "base/unix_domain_socket_posix.h" 23 #include "base/unix_domain_socket_posix.h"
24 24
25 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h" 25 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
26 #include "chrome/common/chrome_constants.h" 26 #include "chrome/common/chrome_constants.h"
27 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/process_watcher.h" 28 #include "chrome/common/process_watcher.h"
29 29
30 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" 30 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h"
31 31
32 static void SaveSUIDUnsafeEnvironmentVariables() { 32 static void SaveSUIDUnsafeEnvironmentVariables() {
33 // The ELF loader will clear many environment variables so we save them to 33 // The ELF loader will clear many environment variables so we save them to
34 // different names here so that the SUID sandbox can resolve them for the 34 // different names here so that the SUID sandbox can resolve them for the
35 // renderer. 35 // renderer.
36 36
37 for (unsigned i = 0; kSUIDUnsafeEnvironmentVariables[i]; ++i) { 37 for (unsigned i = 0; kSUIDUnsafeEnvironmentVariables[i]; ++i) {
38 const char* const envvar = kSUIDUnsafeEnvironmentVariables[i]; 38 const char* const envvar = kSUIDUnsafeEnvironmentVariables[i];
39 char* const saved_envvar = SandboxSavedEnvironmentVariable(envvar); 39 char* const saved_envvar = SandboxSavedEnvironmentVariable(envvar);
40 if (!saved_envvar) 40 if (!saved_envvar)
41 continue; 41 continue;
42 42
43 scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create()); 43 scoped_ptr<base::Environment> env(base::Environment::Create());
44 std::string value; 44 std::string value;
45 if (env->GetEnv(envvar, &value)) 45 if (env->GetEnv(envvar, &value))
46 env->SetEnv(saved_envvar, value); 46 env->SetEnv(saved_envvar, value);
47 else 47 else
48 env->UnSetEnv(saved_envvar); 48 env->UnSetEnv(saved_envvar);
49 49
50 free(saved_envvar); 50 free(saved_envvar);
51 } 51 }
52 } 52 }
53 53
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 !read_pickle.ReadBool(&iter, &tmp_child_exited)) { 335 !read_pickle.ReadBool(&iter, &tmp_child_exited)) {
336 LOG(WARNING) << "Error parsing DidProcessCrash response from zygote."; 336 LOG(WARNING) << "Error parsing DidProcessCrash response from zygote.";
337 return false; 337 return false;
338 } 338 }
339 339
340 if (child_exited) 340 if (child_exited)
341 *child_exited = tmp_child_exited; 341 *child_exited = tmp_child_exited;
342 342
343 return did_crash; 343 return did_crash;
344 } 344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698