Make CF net tests a content::BrowserMainParts.

chrome_frame/test/net/test_automation_provider.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test/net/test_automation_provider.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "chrome/common/automation_messages.h"
@@ skipping 81 matching lines @@
           g_provider_instance_->tab_handle_, new_id++,
           g_provider_instance_->automation_resource_message_filter_, false);
       return job;
     }
   }
 
   return NULL;
 }
 
 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(
       FileVersionInfo::CreateFileVersionInfo(path));
   if (version_info.get()) {
     version = WideToASCII(version_info->product_version());
   }
   return version;
 }
 
 // static
 TestAutomationProvider* TestAutomationProvider::NewAutomationProvider(
     Profile* p, const std::string& channel,
     TestAutomationProviderDelegate* delegate) {
   TestAutomationProvider* automation = new TestAutomationProvider(p, delegate);
   automation->InitializeChannel(channel);
   automation->SetExpectedTabCount(1);
   return automation;
 }