Fix for the InstallFlowTest failures seen on the chrome frame IE6 builder. Th...

Fix for the InstallFlowTest failures seen on the chrome frame IE6 builder. This test registers
the chrome frame BHO dynamically and verifies whether a subsequent navigation attempt to
a chrome frame page works correctly. 

This started failing since the change to set the user agent in the registry. We need to refresh
the IE UA by invoking the UrlMkSetSessionOption API to ensure that the subsequent switching works.

BUG=none
TEST=Covered by existing ChromeFrame InstallFlowTest.


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

[amit, 2011-01-13 22:40:59]

lgtm! Nice to see the install flow breakage getting detected early on.
Thanks for debugging and fixing this.

On Thu, Jan 13, 2011 at 2:33 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Fix for the InstallFlowTest failures seen on the chrome frame IE6 builder.
> This
> test registers
> the chrome frame BHO dynamically and verifies whether a subsequent
> navigation
> attempt to
> a chrome frame page works correctly.
>
> This started failing since the change to set the user agent in the
> registry. We
> need to refresh
> the IE UA by invoking the UrlMkSetSessionOption API to ensure that the
> subsequent switching works.
>
> BUG=none
> TEST=Covered by existing ChromeFrame InstallFlowTest.
>
>
> Please review this at http://codereview.chromium.org/6251005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/chrome_frame_activex.cc
>
>
> Index: chrome_frame/chrome_frame_activex.cc
> ===================================================================
> --- chrome_frame/chrome_frame_activex.cc        (revision 71338)
> +++ chrome_frame/chrome_frame_activex.cc        (working copy)
> @@ -691,5 +691,12 @@
>
>   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
>                             base::win::ScopedVariant(bho));
> -  return S_OK;
> +
> +  hr = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT_REFRESH, NULL, 0, 0);
> +  if (FAILED(hr)) {
> +    DLOG(ERROR) << "Failed to refresh user agent string from registry. "
> +                << "UrlMkSetSessionOption returned "
> +                << base::StringPrintf("0x%08x", hr);
> +  }
> +  return hr;
>  }
>
>
>