mash: Migrate SessionStateDelegate access to WmShell.

mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org

Committed: https://crrev.com/bc0a8b48733b8b39adfddecfc207a11110f59e0f
Cr-Commit-Position: refs/heads/master@{#403070}

[msw, 2016-06-29 01:07:37]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 01:09:04]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[msw, 2016-06-29 01:16:44]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

BUG=
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org
==========

[msw, 2016-06-29 01:16:45]

msw@chromium.org changed reviewers:
+ jamescook@chromium.org

[commit-bot: I haz the power, 2016-06-29 01:29:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 01:29:19]

Dry run: Try jobs failed on following builders:
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[msw, 2016-06-29 18:22:40]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 18:23:38]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-29 18:42:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 18:42:25]

Dry run: Try jobs failed on following builders:
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[msw, 2016-06-29 19:47:11]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org
==========

[msw, 2016-06-29 19:47:25]

Hey James, please take a look; thanks!

[msw, 2016-06-29 19:47:33]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 19:49:56]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-29 20:19:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 20:19:21]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[msw, 2016-06-29 20:32:55]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 20:33:28]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[James Cook, 2016-06-29 21:12:23]

LGTM, nice cleanup.

At some point we should move ownership of the SessionStateDelegate to WmShell,
but that could happen after ShellDelegate is ported over and WmShell can call
CreateSessionStateDelegate directly.

https://codereview.chromium.org/2111443002/diff/60001/ash/root_window_control...
File ash/root_window_controller_unittest.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/root_window_control...
ash/root_window_controller_unittest.cc:425: EXPECT_EQ(0,
wm_shell->GetSessionStateDelegate()->NumberOfLoggedInUsers());
optional nit: Cache a pointer to it?

https://codereview.chromium.org/2111443002/diff/60001/ash/test/ash_test_helpe...
File ash/test/ash_test_helper.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/test/ash_test_helpe...
ash/test/ash_test_helper.cc:196: TestSessionStateDelegate*
AshTestHelper::GetTestSessionStateDelegate() {
optional: Move this method to AshTestBase? And rename to just
GetSessionStateDelegate (but still return TestSessionStateDelegate)? This would
put it close to all the other "session" stuff.

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/gestures/shelf_g...
File ash/wm/gestures/shelf_gesture_handler.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/gestures/shelf_g...
ash/wm/gestures/shelf_gesture_handler.cc:32: if
(!WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers() ||
optional nit: Cache either WmShell* or Delegate* (in theory this could be called
a few times during a drag/swipe)

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/lock_state_contr...
File ash/wm/lock_state_controller_unittest.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/lock_state_contr...
ash/wm/lock_state_controller_unittest.cc:73:
reinterpret_cast<TestShellDelegate*>(Shell::GetInstance()->delegate());
optional: I wonder if static_cast<> would work here.

[commit-bot: I haz the power, 2016-06-29 21:34:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 21:34:30]

Dry run: This issue passed the CQ dry run.

[msw, 2016-06-29 21:43:34]

https://codereview.chromium.org/2111443002/diff/60001/ash/root_window_control...
File ash/root_window_controller_unittest.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/root_window_control...
ash/root_window_controller_unittest.cc:425: EXPECT_EQ(0,
wm_shell->GetSessionStateDelegate()->NumberOfLoggedInUsers());
On 2016/06/29 21:12:22, James Cook wrote:
> optional nit: Cache a pointer to it?

Done.

https://codereview.chromium.org/2111443002/diff/60001/ash/test/ash_test_helpe...
File ash/test/ash_test_helper.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/test/ash_test_helpe...
ash/test/ash_test_helper.cc:196: TestSessionStateDelegate*
AshTestHelper::GetTestSessionStateDelegate() {
On 2016/06/29 21:12:23, James Cook wrote:
> optional: Move this method to AshTestBase? And rename to just
> GetSessionStateDelegate (but still return TestSessionStateDelegate)? This
would
> put it close to all the other "session" stuff.

Eh, doesn't quite make sense to move (used in AshTestHelper), and I don't feel
strongly enough to add a call through in AshTestBase.

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/gestures/shelf_g...
File ash/wm/gestures/shelf_gesture_handler.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/gestures/shelf_g...
ash/wm/gestures/shelf_gesture_handler.cc:32: if
(!WmShell::Get()->GetSessionStateDelegate()->NumberOfLoggedInUsers() ||
On 2016/06/29 21:12:23, James Cook wrote:
> optional nit: Cache either WmShell* or Delegate* (in theory this could be
called
> a few times during a drag/swipe)

I often rely on compiler optimizations for such perf concerns, but done.

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/lock_state_contr...
File ash/wm/lock_state_controller_unittest.cc (right):

https://codereview.chromium.org/2111443002/diff/60001/ash/wm/lock_state_contr...
ash/wm/lock_state_controller_unittest.cc:73:
reinterpret_cast<TestShellDelegate*>(Shell::GetInstance()->delegate());
On 2016/06/29 21:12:23, James Cook wrote:
> optional: I wonder if static_cast<> would work here.

Done.

[msw, 2016-06-29 21:46:15]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
==========

[msw, 2016-06-29 21:46:15]

msw@chromium.org changed reviewers:
+ sky@chromium.org

[msw, 2016-06-29 21:47:02]

Scott, please take a look for chrome/OWNERS; thanks!
(mostly mechanical/straightforward, but not entirely so)

[msw, 2016-06-29 21:47:13]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-29 21:49:26]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-29 22:48:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 22:48:45]

Dry run: This issue passed the CQ dry run.

[sky, 2016-06-29 23:20:22]

LGTM

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/m...
File
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
(right):

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/m...
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc:123:
namespace ash {
IMO this code shouldn't be in ash namespace, but that's a separate issue. I'm
just grumbling, ignore my comment.

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/n...
File chrome/browser/ui/ash/network_connect_delegate_chromeos.cc (right):

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/n...
chrome/browser/ui/ash/network_connect_delegate_chromeos.cc:31: const bool
is_in_secondary_login_screen =
Nice! much better name choice.

[msw, 2016-06-29 23:21:55]

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/m...
File
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
(right):

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/m...
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc:123:
namespace ash {
On 2016/06/29 23:20:21, sky wrote:
> IMO this code shouldn't be in ash namespace, but that's a separate issue. I'm
> just grumbling, ignore my comment.

Acknowledged.

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/n...
File chrome/browser/ui/ash/network_connect_delegate_chromeos.cc (right):

https://codereview.chromium.org/2111443002/diff/80001/chrome/browser/ui/ash/n...
chrome/browser/ui/ash/network_connect_delegate_chromeos.cc:31: const bool
is_in_secondary_login_screen =
On 2016/06/29 23:20:21, sky wrote:
> Nice! much better name choice.

Acknowledged.

[msw, 2016-06-29 23:22:06]

The CQ bit was checked by msw@chromium.org

[msw, 2016-06-29 23:22:07]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2111443002/#ps80001
(title: "Address comments.")

[commit-bot: I haz the power, 2016-06-29 23:23:01]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-29 23:36:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-29 23:36:12]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[msw, 2016-06-29 23:58:56]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBD=stevenjb@chromium.org
==========

[msw, 2016-06-29 23:58:56]

msw@chromium.org changed reviewers:
+ stevenjb@chromium.org

[msw, 2016-06-29 23:59:48]

+TBR stevenjb for chrome/browser/ui/webui/options/chromeos/OWNERS

[msw, 2016-06-29 23:59:59]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2016-06-30 00:00:59]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 00:15:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-30 00:15:50]

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[msw, 2016-06-30 01:40:46]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBD=stevenjb@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org
==========

[msw, 2016-06-30 01:40:53]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2016-06-30 01:41:13]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 02:21:30]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org
==========

[commit-bot: I haz the power, 2016-06-30 02:21:32]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2016-06-30 02:23:25]

Description was changed from

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org
==========

to

==========
mash: Migrate SessionStateDelegate access to WmShell.

Use AshTestHelper::GetTestSessionStateDelegate as needed.
Also fix include/namespace use.

BUG=619636
TEST=Compiles; no behavior changes.
R=jamescook@chromium.org,sky@chromium.org
TBR=stevenjb@chromium.org

Committed: https://crrev.com/bc0a8b48733b8b39adfddecfc207a11110f59e0f
Cr-Commit-Position: refs/heads/master@{#403070}
==========

[commit-bot: I haz the power, 2016-06-30 02:23:27]

Patchset 5 (id:??) landed as
https://crrev.com/bc0a8b48733b8b39adfddecfc207a11110f59e0f
Cr-Commit-Position: refs/heads/master@{#403070}