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

Side by Side Diff: chrome/common/logging_chrome_uitest.cc

Issue 2836088: base: rename Environment::SetEnv to Environment::SetVar. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: 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
« no previous file with comments | « chrome/browser/zygote_host_linux.cc ('k') | chrome/plugin/plugin_main_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 class ChromeLoggingTest : public testing::Test { 23 class ChromeLoggingTest : public testing::Test {
24 public: 24 public:
25 // Stores the current value of the log file name environment 25 // Stores the current value of the log file name environment
26 // variable and sets the variable to new_value. 26 // variable and sets the variable to new_value.
27 void SaveEnvironmentVariable(std::string new_value) { 27 void SaveEnvironmentVariable(std::string new_value) {
28 scoped_ptr<base::Environment> env(base::Environment::Create()); 28 scoped_ptr<base::Environment> env(base::Environment::Create());
29 if (!env->GetEnv(env_vars::kLogFileName, &environment_filename_)) 29 if (!env->GetEnv(env_vars::kLogFileName, &environment_filename_))
30 environment_filename_ = ""; 30 environment_filename_ = "";
31 31
32 env->SetEnv(env_vars::kLogFileName, new_value); 32 env->SetVar(env_vars::kLogFileName, new_value);
33 } 33 }
34 34
35 // Restores the value of the log file nave environment variable 35 // Restores the value of the log file nave environment variable
36 // previously saved by SaveEnvironmentVariable(). 36 // previously saved by SaveEnvironmentVariable().
37 void RestoreEnvironmentVariable() { 37 void RestoreEnvironmentVariable() {
38 scoped_ptr<base::Environment> env(base::Environment::Create()); 38 scoped_ptr<base::Environment> env(base::Environment::Create());
39 env->SetEnv(env_vars::kLogFileName, environment_filename_); 39 env->SetVar(env_vars::kLogFileName, environment_filename_);
40 } 40 }
41 41
42 private: 42 private:
43 std::string environment_filename_; // Saves real environment value. 43 std::string environment_filename_; // Saves real environment value.
44 }; 44 };
45 45
46 // Tests the log file name getter without an environment variable. 46 // Tests the log file name getter without an environment variable.
47 TEST_F(ChromeLoggingTest, LogFileName) { 47 TEST_F(ChromeLoggingTest, LogFileName) {
48 SaveEnvironmentVariable(""); 48 SaveEnvironmentVariable("");
49 49
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 if (UITest::in_process_renderer()) { 180 if (UITest::in_process_renderer()) {
181 // in process mode doesn't do the crashing. 181 // in process mode doesn't do the crashing.
182 expected_crashes_ = 0; 182 expected_crashes_ = 0;
183 } else { 183 } else {
184 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 184 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
185 ASSERT_TRUE(browser.get()); 185 ASSERT_TRUE(browser.get());
186 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms())); 186 ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
187 expected_crashes_ = EXPECTED_CRASH_CRASHES; 187 expected_crashes_ = EXPECTED_CRASH_CRASHES;
188 } 188 }
189 } 189 }
OLDNEW
« no previous file with comments | « chrome/browser/zygote_host_linux.cc ('k') | chrome/plugin/plugin_main_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698