diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 02:56:24 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 02:56:24 +0000 |
| commit | 7dd06a0131c05212100c81ae88ae07f0757ff4db (patch) | |
| tree | 8b42ff631ecaa927da86b40d47fe6298f972a8a7 /chrome_frame/urlmon_bind_status_callback.cc | |
| parent | d077249e28b8163aabf452604716dba216303207 (diff) | |
| download | chromium_src-7dd06a0131c05212100c81ae88ae07f0757ff4db.zip chromium_src-7dd06a0131c05212100c81ae88ae07f0757ff4db.tar.gz chromium_src-7dd06a0131c05212100c81ae88ae07f0757ff4db.tar.bz2 | |
Temporary workaround to get tests that reference singletons either directly or indirectly to pass.
With the recent Singleton refactoring, these tests started exposing some inherent problems with singletons, namely that one test can reference a state set by a different test, which can cause all sorts of flakiness.
Furthermore, some of these tests could reference the registry which may have some user specific settings that could cause the tests to fail
To work around these issues, I'm adding a few utility classes for tests (registry virtualization) and exposing a method to reset singletons before a test is run.
TEST=Fixes flakiness and a few tests that could fail on the waterfall.
BUG=none
Review URL: http://codereview.chromium.org/5564009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_bind_status_callback.cc')
| -rw-r--r-- | chrome_frame/urlmon_bind_status_callback.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/urlmon_bind_status_callback.cc b/chrome_frame/urlmon_bind_status_callback.cc index 3d03542..474f8f3 100644 --- a/chrome_frame/urlmon_bind_status_callback.cc +++ b/chrome_frame/urlmon_bind_status_callback.cc @@ -171,7 +171,7 @@ void SniffData::DetermineRendererType(bool last_chance) { if (is_undetermined()) { if (last_chance) renderer_type_ = OTHER; - if (IsChrome(RendererTypeForUrl(url_.c_str()))) { + if (IsChrome(RendererTypeForUrl(url_))) { renderer_type_ = CHROME; } else { if (is_cache_valid() && cache_) { @@ -428,4 +428,3 @@ bool BSCBStorageBind::ShouldCacheProgress(unsigned long status_code) const { return false; } - |