diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 23:07:08 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 23:07:08 +0000 |
| commit | 0ba6f54e6f4cacbf58cf21444457130fbc5556fb (patch) | |
| tree | c58dc8fcdeae96121fc4b21bfb0cd4b01344d537 /chrome_frame/test_utils.h | |
| parent | 3c8466f5a1bed3699980684243c43ff03c2130ee (diff) | |
| download | chromium_src-0ba6f54e6f4cacbf58cf21444457130fbc5556fb.zip chromium_src-0ba6f54e6f4cacbf58cf21444457130fbc5556fb.tar.gz chromium_src-0ba6f54e6f4cacbf58cf21444457130fbc5556fb.tar.bz2 | |
Fixes for the flakiness in the chrome frame net tests run seen on the per user IE8 builder.
The flakiness occurs because IE starts up before chrome_frame_helper which results in a failure
to register a BHO for the IE window.
Fix is to make the ChromeFrame registrar object a member of the chrome frame net test suite.
Rearranged some code which ensures that we can now run chrome_frame_net_tests in debug builds
without annoying DCHECKs
BUG=none
TEST=chrome frame net tests.
Review URL: http://codereview.chromium.org/6650003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test_utils.h')
| -rw-r--r-- | chrome_frame/test_utils.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h index 7b66083..8787964 100644 --- a/chrome_frame/test_utils.h +++ b/chrome_frame/test_utils.h @@ -57,6 +57,9 @@ class ScopedChromeFrameRegistrar { // Indicates whether per user or per machine registration is needed. RegistrationType registration_type_; + // We need to register the chrome path provider only once per process. This + // flag keeps track of that. + static bool register_chrome_path_provider_; }; // Returns the path to the Chrome Frame DLL in the build directory. Assumes |