diff options
| author | reillyg <reillyg@chromium.org> | 2015-05-05 14:00:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 21:00:52 +0000 |
| commit | 4a96f6295a17790036908f527d841e9ef7d0a7d6 (patch) | |
| tree | acac19b391358d341be89bdf72dc0d1d9b86f394 /extensions/shell/test | |
| parent | 08871cc66afb0707a2ed83ebbc08a78a7af7809a (diff) | |
| download | chromium_src-4a96f6295a17790036908f527d841e9ef7d0a7d6.zip chromium_src-4a96f6295a17790036908f527d841e9ef7d0a7d6.tar.gz chromium_src-4a96f6295a17790036908f527d841e9ef7d0a7d6.tar.bz2 | |
Set the content shell data path to the app shell test data directory.
When running app_shell-based tests the content shell data path should be
set to the test data directory so that tests do not interfere with each
other or result in persistent state changes. This is what is done by the
ContentTestLauncherDelegate for content_shell-based tests.
BUG=483328
Review URL: https://codereview.chromium.org/1118183002
Cr-Commit-Position: refs/heads/master@{#328400}
Diffstat (limited to 'extensions/shell/test')
| -rw-r--r-- | extensions/shell/test/DEPS | 1 | ||||
| -rw-r--r-- | extensions/shell/test/shell_test_launcher_delegate.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/extensions/shell/test/DEPS b/extensions/shell/test/DEPS index 4759ee0..91f7528 100644 --- a/extensions/shell/test/DEPS +++ b/extensions/shell/test/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+content/public/browser", + "+content/shell/common", # Testing utilities can access anything in extensions/shell. "+extensions/shell", diff --git a/extensions/shell/test/shell_test_launcher_delegate.cc b/extensions/shell/test/shell_test_launcher_delegate.cc index ce7bc59..8828c03 100644 --- a/extensions/shell/test/shell_test_launcher_delegate.cc +++ b/extensions/shell/test/shell_test_launcher_delegate.cc @@ -4,7 +4,9 @@ #include "extensions/shell/test/shell_test_launcher_delegate.h" +#include "base/command_line.h" #include "base/test/test_suite.h" +#include "content/shell/common/shell_switches.h" #include "extensions/shell/app/shell_main_delegate.h" namespace extensions { @@ -16,6 +18,8 @@ int AppShellTestLauncherDelegate::RunTestSuite(int argc, char** argv) { bool AppShellTestLauncherDelegate::AdjustChildProcessCommandLine( base::CommandLine* command_line, const base::FilePath& temp_data_dir) { + command_line->AppendSwitchPath(switches::kContentShellDataPath, + temp_data_dir); return true; } |