Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6557)

Unified Diff: chrome_frame/test/net/test_automation_provider.cc

Issue 8894008: Make CF net tests a content::BrowserMainParts. (Closed) Base URL: ssh://joi@192.168.1.201/home/joi/c/chrome/src@cfnettests
Patch Set: Mostly functional, but needs polish. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/test/net/test_automation_provider.cc
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index a32074d00e322a35cc0f80d82beb2b13f025a27d..9884821665262f732198ade50fc2e2df7db8d6a6 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(

Powered by Google App Engine
This is Rietveld 408576698