diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 20:04:14 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 20:04:14 +0000 |
| commit | a877d06fc0cba436f6452b74233269ecf4059c75 (patch) | |
| tree | b43c9bd3673707eec46a3fab0e55ce12691c0263 /chrome | |
| parent | 24287ab52e13898447a882b34f369bf2a05ebc8a (diff) | |
| download | chromium_src-a877d06fc0cba436f6452b74233269ecf4059c75.zip chromium_src-a877d06fc0cba436f6452b74233269ecf4059c75.tar.gz chromium_src-a877d06fc0cba436f6452b74233269ecf4059c75.tar.bz2 | |
Fix CheckFalseTest.CheckFails on Linux after my change to ui_test.
This makes PathService clear its cache after overriding a path.
We have many paths depending on each other, so this is necessary
to avoid inconsistencies.
Added a comment that PathService::Override should not be called
by production code.
TEST=ui_tests in Release mode
BUG=49838
Review URL: http://codereview.chromium.org/2805100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/profile_impl.cc | 14 | ||||
| -rw-r--r-- | chrome/common/logging_chrome_uitest.cc | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc index bb335bf..dbf3462 100644 --- a/chrome/browser/profile_impl.cc +++ b/chrome/browser/profile_impl.cc @@ -299,17 +299,15 @@ ProfileImpl::ProfileImpl(const FilePath& path) // for a spec on where cache files go. The net effect for most systems is we // use ~/.cache/chromium/ for Chromium and ~/.cache/google-chrome/ for // official builds. - if (!PathService::IsOverridden(chrome::DIR_USER_DATA)) { #if defined(GOOGLE_CHROME_BUILD) - const char kCacheDir[] = "google-chrome"; + const char kCacheDir[] = "google-chrome"; #else - const char kCacheDir[] = "chromium"; + const char kCacheDir[] = "chromium"; #endif - PathService::Get(base::DIR_USER_CACHE, &base_cache_path_); - base_cache_path_ = base_cache_path_.Append(kCacheDir); - if (!file_util::PathExists(base_cache_path_)) - file_util::CreateDirectory(base_cache_path_); - } + PathService::Get(base::DIR_USER_CACHE, &base_cache_path_); + base_cache_path_ = base_cache_path_.Append(kCacheDir); + if (!file_util::PathExists(base_cache_path_)) + file_util::CreateDirectory(base_cache_path_); #endif if (base_cache_path_.empty()) base_cache_path_ = path_; diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc index 328a5a49..216f156 100644 --- a/chrome/common/logging_chrome_uitest.cc +++ b/chrome/common/logging_chrome_uitest.cc @@ -130,9 +130,6 @@ class CheckFalseTest : public UITest { #elif defined(OS_MACOSX) // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 #define CheckFails DISABLED_CheckFails -#elif defined(OS_LINUX) -// TODO(phajdan) Fix this - http://crbug.com/49838 -#define CheckFails FAILS_CheckFails #endif // Launch the app in assertion test mode, then close the app. TEST_F(CheckFalseTest, CheckFails) { |