| 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 "chrome/test/base/test_launcher_utils.h" | 5 #include "chrome/test/base/test_launcher_utils.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/environment.h" | 8 #include "base/environment.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
| 14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
| 15 #include "components/encryptor/encryptor_switches.h" | 15 #include "components/encryptor/encryptor_switches.h" |
| 16 | 16 |
| 17 #if defined(USE_AURA) | 17 #if defined(USE_AURA) |
| 18 #include "ui/views/corewm/corewm_switches.h" | 18 #include "ui/wm/core/wm_core_switches.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 namespace test_launcher_utils { | 21 namespace test_launcher_utils { |
| 22 | 22 |
| 23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) { | 23 void PrepareBrowserCommandLineForTests(CommandLine* command_line) { |
| 24 // Turn off tip loading for tests; see http://crbug.com/17725. | 24 // Turn off tip loading for tests; see http://crbug.com/17725. |
| 25 command_line->AppendSwitch(switches::kDisableWebResources); | 25 command_line->AppendSwitch(switches::kDisableWebResources); |
| 26 | 26 |
| 27 // Turn off preconnects because they break the brittle python webserver; | 27 // Turn off preconnects because they break the brittle python webserver; |
| 28 // see http://crbug.com/60035. | 28 // see http://crbug.com/60035. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 // Note: we use an environment variable here, because we have to pass the | 87 // Note: we use an environment variable here, because we have to pass the |
| 88 // value to the child process. This is the simplest way to do it. | 88 // value to the child process. This is the simplest way to do it. |
| 89 scoped_ptr<base::Environment> env(base::Environment::Create()); | 89 scoped_ptr<base::Environment> env(base::Environment::Create()); |
| 90 success = success && env->SetVar("XDG_CACHE_HOME", user_data_dir.value()); | 90 success = success && env->SetVar("XDG_CACHE_HOME", user_data_dir.value()); |
| 91 #endif | 91 #endif |
| 92 | 92 |
| 93 return success; | 93 return success; |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace test_launcher_utils | 96 } // namespace test_launcher_utils |
| OLD | NEW |