| 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" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 // Disable safebrowsing autoupdate. | 45 // Disable safebrowsing autoupdate. |
| 46 command_line->AppendSwitch(switches::kSbDisableAutoUpdate); | 46 command_line->AppendSwitch(switches::kSbDisableAutoUpdate); |
| 47 | 47 |
| 48 // Don't install default apps. | 48 // Don't install default apps. |
| 49 command_line->AppendSwitch(switches::kDisableDefaultApps); | 49 command_line->AppendSwitch(switches::kDisableDefaultApps); |
| 50 | 50 |
| 51 #if defined(USE_AURA) | 51 #if defined(USE_AURA) |
| 52 // Disable window animations under Ash as the animations effect the | 52 // Disable window animations under Ash as the animations effect the |
| 53 // coordinates returned and result in flake. | 53 // coordinates returned and result in flake. |
| 54 command_line->AppendSwitch( | 54 command_line->AppendSwitch( |
| 55 views::corewm::switches::kWindowAnimationsDisabled); | 55 wm::switches::kWindowAnimationsDisabled); |
| 56 #endif | 56 #endif |
| 57 | 57 |
| 58 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 58 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
| 59 // Don't use the native password stores on Linux since they may | 59 // Don't use the native password stores on Linux since they may |
| 60 // prompt for additional UI during tests and cause test failures or | 60 // prompt for additional UI during tests and cause test failures or |
| 61 // timeouts. Win, Mac and ChromeOS don't look at the kPasswordStore | 61 // timeouts. Win, Mac and ChromeOS don't look at the kPasswordStore |
| 62 // switch. | 62 // switch. |
| 63 if (!command_line->HasSwitch(switches::kPasswordStore)) | 63 if (!command_line->HasSwitch(switches::kPasswordStore)) |
| 64 command_line->AppendSwitchASCII(switches::kPasswordStore, "basic"); | 64 command_line->AppendSwitchASCII(switches::kPasswordStore, "basic"); |
| 65 #endif | 65 #endif |
| (...skipping 21 matching lines...) Expand all 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 |