Make Chrome built for Chrome OS works on Linux with --stub-cros

Make Chrome built for Chrome OS works on Linux with --stub-cros

This functionality was recently broken by this cl: http://codereview.chromium.org/7029019

BUG=none
TEST=build Chrome of Chrome OS and run it on Linux with --stub-cros, no crash should observed

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

[zel, 2011-05-20 06:57:17]

No need for this CL. I have a fix for the real problem ready to check in
gimme 5 minutes.

On Thu, May 19, 2011 at 11:22 PM, <dpolukhin@chromium.org> wrote:

> Reviewers: zel, viettrungluu,
>
> Description:
> Make Chrome built for Chrome OS works on Linux with --stub-cros
>
> This functionality was recently broken by this cl:
> http://codereview.chromium.org/7029019
>
> BUG=none
> TEST=build Chrome of Chrome OS and run it on Linux with --stub-cros, no
> crash
> should observed
>
>
> Please review this at http://codereview.chromium.org/6990003/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
>  M chrome/browser/browser_main.cc
>
>
> Index: chrome/browser/browser_main.cc
> diff --git a/chrome/browser/browser_main.cc
> b/chrome/browser/browser_main.cc
> index
>
6148e0c553444f458564ba16b6ffa6cd28d2f1c1..46d7efcca2d0e6c6832563be5fbe02f5c98eba89
> 100644
> --- a/chrome/browser/browser_main.cc
> +++ b/chrome/browser/browser_main.cc
> @@ -1201,6 +1201,14 @@ int BrowserMain(const MainFunctionParams&
> parameters) {
>   // Must happen before we try to use a message loop or display any UI.
>   InitializeToolkit(parameters);
>
> +#if defined(OS_CHROMEOS)
> +  // Stub out chromeos implementations. We need to do as early as possible
> +  // because it is initialized on first use when it is initialized
> +  // SetUseStubImpl doesn't do anything.
> +  if (parameters.command_line_.HasSwitch(switches::kStubCros))
> +    chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl();
> +#endif
> +
>   parts->MainMessageLoopStart();
>
>   // WARNING: If we get a WM_ENDSESSION, objects created on the stack here
> @@ -1530,10 +1538,6 @@ int BrowserMain(const MainFunctionParams&
> parameters) {
>   // Profile creation
> ----------------------------------------------------------
>
>  #if defined(OS_CHROMEOS)
> -  // Stub out chromeos implementations.
> -  if (parsed_command_line.HasSwitch(switches::kStubCros))
> -    chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl();
> -
>   // Initialize the screen locker now so that it can receive
>   // LOGIN_USER_CHANGED notification from UserManager.
>   chromeos::ScreenLocker::InitClass();
>
>
>

[Dmitry Polukhin, 2011-05-24 14:01:13]

On 2011/05/20 06:57:17, zel wrote:
> No need for this CL. I have a fix for the real problem ready to check in
> gimme 5 minutes.

I still observe crash when libcros functions are called but not defined i.e.
NULL. Perhaps we are talking about different problems. My case when Chrome is
working on Linux with --stub-cros like:

out/Debug/chrome --stub-cros --user-data-dir=/tmp/chrome --login-profile=user
--no-first-run --login-user=<login> --login-password=<password>

Therefore my patch still required and it works as before.

[jstritar, 2011-05-24 17:32:59]

On 2011/05/24 14:01:13, Dmitry Polukhin wrote:
> 
> I still observe crash when libcros functions are called but not defined i.e.
> NULL. Perhaps we are talking about different problems. My case when Chrome is
> working on Linux with --stub-cros like:
> 
> out/Debug/chrome --stub-cros --user-data-dir=/tmp/chrome --login-profile=user
> --no-first-run --login-user=<login> --login-password=<password>
> 
> Therefore my patch still required and it works as before.

Thanks this fixed the segfault on my machine.

[achuithb, 2011-05-25 01:26:40]

LGTM. 

Fixes my seg-fault too. This blocked me for a few hours.

[Dmitry Polukhin, 2011-05-25 08:39:03]

I committed my change because the issue affects people and my change is very
simple.

[achuithb, 2011-05-25 09:25:11]

On 2011/05/25 08:39:03, Dmitry Polukhin wrote:
> I committed my change because the issue affects people and my change is very
> simple.

Thanks.