| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/environment.h" | 6 #include "base/environment.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 show_window_ = true; | 43 show_window_ = true; |
| 44 } | 44 } |
| 45 | 45 |
| 46 virtual void SetUp() { | 46 virtual void SetUp() { |
| 47 // Set the log_file_name_ path according to the selected browser_directory_. | 47 // Set the log_file_name_ path according to the selected browser_directory_. |
| 48 log_file_name_ = browser_directory_.AppendASCII("chrome_debug.log"); | 48 log_file_name_ = browser_directory_.AppendASCII("chrome_debug.log"); |
| 49 | 49 |
| 50 // Set the log file path for the browser test. | 50 // Set the log file path for the browser test. |
| 51 scoped_ptr<base::Environment> env(base::Environment::Create()); | 51 scoped_ptr<base::Environment> env(base::Environment::Create()); |
| 52 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 53 env->SetVar(env_vars::kLogFileName, | 53 env->SetVar(env_vars::kLogFileName, WideToUTF8(log_file_name_.value())); |
| 54 base::WideToUTF8(log_file_name_.value())); | |
| 55 #else | 54 #else |
| 56 env->SetVar(env_vars::kLogFileName, log_file_name_.value()); | 55 env->SetVar(env_vars::kLogFileName, log_file_name_.value()); |
| 57 #endif | 56 #endif |
| 58 | 57 |
| 59 // Add the necessary arguments to Chrome's launch command for these tests. | 58 // Add the necessary arguments to Chrome's launch command for these tests. |
| 60 AddLaunchArguments(); | 59 AddLaunchArguments(); |
| 61 | 60 |
| 62 // Run the rest of the UITest initialization. | 61 // Run the rest of the UITest initialization. |
| 63 UITest::SetUp(); | 62 UITest::SetUp(); |
| 64 } | 63 } |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 RunTabSwitchingUITest("t", true); | 193 RunTabSwitchingUITest("t", true); |
| 195 } | 194 } |
| 196 | 195 |
| 197 // Started failing with a webkit roll in r49936. See http://crbug.com/46751 | 196 // Started failing with a webkit roll in r49936. See http://crbug.com/46751 |
| 198 TEST_F(TabSwitchingUITest, DISABLED_TabSwitchRef) { | 197 TEST_F(TabSwitchingUITest, DISABLED_TabSwitchRef) { |
| 199 UseReferenceBuild(); | 198 UseReferenceBuild(); |
| 200 RunTabSwitchingUITest("t_ref", true); | 199 RunTabSwitchingUITest("t_ref", true); |
| 201 } | 200 } |
| 202 | 201 |
| 203 } // namespace | 202 } // namespace |
| OLD | NEW |