summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 07:56:27 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 07:56:27 +0000
commitf4f41b9a114089499a0019bc700e7a7772dccccb (patch)
treeab4ebea0b4d25a1bebe0730097fd4407f53f11b2 /chrome/test
parent9b0718510886b13ee0ff6a2248285cbba2f08d1c (diff)
downloadchromium_src-f4f41b9a114089499a0019bc700e7a7772dccccb.zip
chromium_src-f4f41b9a114089499a0019bc700e7a7772dccccb.tar.gz
chromium_src-f4f41b9a114089499a0019bc700e7a7772dccccb.tar.bz2
Fix a pyauto crash while loading locales.
Override base::DIR_MODULE too. This is needed for loading up resources correctly. BUG=40192 TEST=python chrome/test/functional/test_basic.py Review URL: http://codereview.chromium.org/1555005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/unit/chrome_test_suite.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 42f57b7..9532579 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -119,8 +119,10 @@ class ChromeTestSuite : public TestSuite {
if (!user_data_dir.empty())
PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
- if (!browser_dir_.empty())
+ if (!browser_dir_.empty()) {
PathService::Override(base::DIR_EXE, browser_dir_);
+ PathService::Override(base::DIR_MODULE, browser_dir_);
+ }
#if defined(OS_MACOSX)
// Look in the framework bundle for resources.