Disable the chrome frame net tests on IE9 as the IE9 fails to connect at time...

Disable the chrome frame net tests on IE9 as the IE9 fails to connect at times to
the python web server. This needs more investigation.

TBR=amit


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=66138

[amit, 2010-11-13 07:21:32]

ok

On Fri, Nov 12, 2010 at 5:31 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Disable the chrome frame net tests on IE9 as the IE9 fails to connect at
> times
> to
> the python web server. This needs more investigation.
>
> TBR=amit
>
>
> Please review this at http://codereview.chromium.org/4945001/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/test/net/fake_external_tab.h
>  M     chrome_frame/test/net/fake_external_tab.cc
>
>
> Index: chrome_frame/test/net/fake_external_tab.cc
> ===================================================================
> --- chrome_frame/test/net/fake_external_tab.cc  (revision 65626)
> +++ chrome_frame/test/net/fake_external_tab.cc  (working copy)
> @@ -304,7 +304,7 @@
>   // done by TestSuite::Initialize.  We can't call the base class
>   // directly because it will attempt to initialize some things such as
>   // ICU that have already been initialized for this process.
> -  InitializeLogging();
> +  CFUrlRequestUnittestRunner::InitializeLogging();
>   base::Time::EnableHighResolutionTimer(true);
>
>   SuppressErrorDialogs();
> @@ -472,6 +472,15 @@
>  ObligatoryModule g_obligatory_atl_module;
>
>  int main(int argc, char** argv) {
> +  if (chrome_frame_test::GetInstalledIEVersion() == IE_9) {
> +    // Adding this here as the command line and the logging stuff gets
> +    // initialized in the NetTestSuite constructor. Did not want to break
> that.
> +    base::AtExitManager at_exit_manager_;
> +    CommandLine::Init(argc, argv);
> +    CFUrlRequestUnittestRunner::InitializeLogging();
> +    LOG(INFO) << "Not running ChromeFrame net tests on IE9";
> +    return 0;
> +  }
>   WindowWatchdog watchdog;
>   // See url_request_unittest.cc for these credentials.
>   SupplyProxyCredentials credentials("user", "secret");
> Index: chrome_frame/test/net/fake_external_tab.h
> ===================================================================
> --- chrome_frame/test/net/fake_external_tab.h   (revision 65626)
> +++ chrome_frame/test/net/fake_external_tab.h   (working copy)
> @@ -73,6 +73,9 @@
>
>   void StartTests();
>
> +  // Borrowed from TestSuite::Initialize().
> +  static void InitializeLogging();
> +
>  protected:
>   // This is the thread that runs all the UrlRequest tests.
>   // Within its context, the Initialize() and Shutdown() routines above
> @@ -82,8 +85,6 @@
>   static void TakeDownBrowser(CFUrlRequestUnittestRunner* me);
>
>  protected:
> -  // Borrowed from TestSuite::Initialize().
> -  void InitializeLogging();
>
>  protected:
>   ScopedHandle test_thread_;
>
>
>