Another attempt to fix the ChromeFrame InstallFlowTest failures. We need to r...

Another attempt to fix the ChromeFrame InstallFlowTest failures. We need to refresh the user
agent before invoking SetSite on the ChromeFrame BHO to ensure that the protocol sink patch
is not disabled.

BUG=none
TEST=Covered by existing ChromeFrame InstallFlowTest.


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

[amit, 2011-01-14 00:05:24]

ok

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

> Reviewers: amit,
>
> Description:
> Another attempt to fix the ChromeFrame InstallFlowTest failures. We need to
> refresh the user
> agent before invoking SetSite on the ChromeFrame BHO to ensure that the
> protocol
> sink patch
> is not disabled.
>
> BUG=none
> TEST=Covered by existing ChromeFrame InstallFlowTest.
>
>
> Please review this at http://codereview.chromium.org/6252004/
>
> 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 71373)
> +++ chrome_frame/chrome_frame_activex.cc        (working copy)
> @@ -682,6 +682,14 @@
>     return hr;
>   }
>
> +  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;
> +  }
> +
>   hr = bho->SetSite(web_browser2);
>   if (FAILED(hr)) {
>     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
> @@ -691,12 +699,5 @@
>
>   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
>                             base::win::ScopedVariant(bho));
> -
> -  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;
> +  return S_OK;
>  }
>
>
>