Fix crash which occurs when combining AthenaTestBase tests and other tests

Fix crash which occurs when combining tests which inherit from AthenaTestBase
and tests which inherit from AuraTestBase in the same target

BUG=None
TEST=None

Committed: https://crrev.com/85b87978351f4449aba1aa68f459342600fafdfc
Cr-Commit-Position: refs/heads/master@{#296286}

[pkotwicz, 2014-09-23 14:25:49]

pkotwicz@chromium.org changed reviewers:
+ oshima@chromium.org

[pkotwicz, 2014-09-23 14:27:31]

Oshima, can you please take a look?

In particular, this crash occurs with https://codereview.chromium.org/545393002/
It occurs when running all of athena_unittests but not when running
DragHandleTest.ScrollTest individually

[oshima, 2014-09-23 17:17:34]

https://codereview.chromium.org/597543002/diff/1/athena/main/athena_launcher.cc
File athena/main/athena_launcher.cc (right):

https://codereview.chromium.org/597543002/diff/1/athena/main/athena_launcher....
athena/main/athena_launcher.cc:103: views::ViewsDelegate::views_delegate = new
AthenaViewsDelegate();
I think it's more consistent to Create/Shutdown static method in
AthenaViewsDelegate and update the views::ViewsDelegate::views_delegate. WDYT?

[pkotwicz, 2014-09-23 20:18:03]

Done! Oshima, can you please take another look?

[oshima, 2014-09-23 20:35:53]

lgtm with nits.

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
File athena/main/athena_views_delegate.cc (right):

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
athena/main/athena_views_delegate.cc:15: class AthenaViewsDelegateImpl : public
AthenaViewsDelegate,
and you don't have to extend AthenaViewsDelegate. 

I'm ok for AthenaViewsDelegate being just an interface to create/shutdown
AthenaViewsDelegateImpl class.

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
File athena/main/athena_views_delegate.h (right):

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
athena/main/athena_views_delegate.h:15: static views::ViewsDelegate* Create();
You don't have to return the instance, do you?

[pkotwicz, 2014-09-23 20:44:38]

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
File athena/main/athena_views_delegate.cc (right):

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
athena/main/athena_views_delegate.cc:15: class AthenaViewsDelegateImpl : public
AthenaViewsDelegate,
Oshima, do you think that it is worth AthenaViewsDelegate being a class?

We could have two functions:
CreateAthenaViewsDelegate()
ShutdownAthenaViewsDelegate()

[oshima, 2014-09-23 20:49:56]

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
File athena/main/athena_views_delegate.cc (right):

https://codereview.chromium.org/597543002/diff/20001/athena/main/athena_views...
athena/main/athena_views_delegate.cc:15: class AthenaViewsDelegateImpl : public
AthenaViewsDelegate,
On 2014/09/23 20:44:38, pkotwicz wrote:
> Oshima, do you think that it is worth AthenaViewsDelegate being a class?
> 
> We could have two functions:
> CreateAthenaViewsDelegate()
> ShutdownAthenaViewsDelegate()
> 

SGTM

[pkotwicz, 2014-09-23 21:13:20]

The CQ bit was checked by pkotwicz@chromium.org

[commit-bot: I haz the power, 2014-09-23 21:16:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/597543002/40001

[commit-bot: I haz the power, 2014-09-23 22:37:41]

Committed patchset #3 (id:40001) as ce05cd83abe16ccaddfe6e05a46d7f97d3bda8f9

[commit-bot: I haz the power, 2014-09-23 22:38:25]

Patchset 3 (id:??) landed as
https://crrev.com/85b87978351f4449aba1aa68f459342600fafdfc
Cr-Commit-Position: refs/heads/master@{#296286}