diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 21:34:24 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 21:34:24 +0000 |
| commit | f9b85d83b284fa4e7d1f12ef153883d38ddf3258 (patch) | |
| tree | 0998eb6ab997d77ae8870f72db707122b6122aa2 /chrome_frame/test/net/test_automation_provider.cc | |
| parent | 810aa6d08ed39089b1f4c1f71ad48ed0c918feca (diff) | |
| download | chromium_src-f9b85d83b284fa4e7d1f12ef153883d38ddf3258.zip chromium_src-f9b85d83b284fa4e7d1f12ef153883d38ddf3258.tar.gz chromium_src-f9b85d83b284fa4e7d1f12ef153883d38ddf3258.tar.bz2 | |
This goes most of the way to re-enabling chrome_frame_net_tests by making it a content::BrowserMainParts. The tests are still disabled until we are able to test them on IE8 and older; on IE9 all tests currently pass except for a few that hang.
Additionally, this makes chrome_frame_net_tests determine protocol version using the exact same version information as npchrome_frame.dll does, so that version mismatch due to the RC dependency problems we have sometimes seen should not happen any more with this test suite.
While in there, I also updated the poor_mans_trybot.bat script.
BUG=105435
Review URL: http://codereview.chromium.org/8894008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net/test_automation_provider.cc')
| -rw-r--r-- | chrome_frame/test/net/test_automation_provider.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc index a32074d..9884821 100644 --- a/chrome_frame/test/net/test_automation_provider.cc +++ b/chrome_frame/test/net/test_automation_provider.cc @@ -99,10 +99,17 @@ net::URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request, } std::string TestAutomationProvider::GetProtocolVersion() { - // Return the version of chrome.dll + // Return the version of npchrome_frame.dll. We used to use + // chrome.dll, but the other end of the pipe in this case is + // actually npchrome_frame.dll (which fetches its version info from + // itself), and occasionally we run into RC dependency problems in + // incremental builds so that the version information does not get + // updated in one module but does in another, so better to use the + // exact same version to avoid hard-to-debug problems in development + // builds. FilePath path; PathService::Get(base::DIR_MODULE, &path); - path = path.AppendASCII("chrome.dll"); + path = path.AppendASCII("npchrome_frame.dll"); std::string version; scoped_ptr<FileVersionInfo> version_info( |