[MediaRouter, Android] Rebase the controller dialog fragment.

[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller)
- that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org

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

[whywhat, 2016-11-24 01:22:55]

avayvod@chromium.org changed reviewers:
+ mlamouri@chromium.org, zqzhang@chromium.org

[whywhat, 2016-11-24 01:22:55]

PTaL

[whywhat, 2016-11-24 01:23:14]

Description was changed from

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
==========

to

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

[whywhat, 2016-11-24 01:25:59]

The CQ bit was checked by avayvod@chromium.org

[commit-bot: I haz the power, 2016-11-24 01:27:03]

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-11-24 03:28:22]

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

[commit-bot: I haz the power, 2016-11-24 03:28:23]

Try jobs failed on following builders:
  cast_shell_linux on master.tryserver.chromium.linux (JOB_TIMED_OUT, no build
URL)
  chromeos_amd64-generic_chromium_compile_only_ng on
master.tryserver.chromium.linux (JOB_TIMED_OUT, no build URL)
  chromeos_daisy_chromium_compile_only_ng on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)
  chromeos_x86-generic_chromium_compile_only_ng on
master.tryserver.chromium.linux (JOB_TIMED_OUT, no build URL)
  chromium_presubmit on master.tryserver.chromium.linux (JOB_TIMED_OUT, no build
URL)
  linux_chromium_chromeos_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)
  linux_chromium_clobber_rel_ng on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)
  linux_chromium_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_TIMED_OUT, no
build URL)

[Zhiqiang Zhang (Slow), 2016-11-24 11:08:48]

The rebasing sgtm, but is it a pure structural change without any logical
change? How does it fix http://crbug.com/667269?

[whywhat, 2016-11-24 13:06:46]

On 2016/11/24 at 11:08:48, zqzhang wrote:
> The rebasing sgtm, but is it a pure structural change without any logical
change? How does it fix http://crbug.com/667269?

Sorry, the description is confusing because of the long class names I assume.
The Fragment subclass that we use for device picker was inheriting through the
common base Fragment that inherited from the Android's MR_Chooser_DlgFragment
(underscores are for emphasis on the important part of the name).
Unfortunately, using the common base class meant that the subclass we had for
controlling the connected session was also inherited from the _chooser_
fragment.
So I copied the code from the common base class into each individual subclass -
that's no logic change; but then I was able to inherit the latter Fragment
subclass from the _controller_ dialog fragment which fixes the bug.

This was a very subtle mistake that I noticed accidentally after three days of
debugging :)

[whywhat, 2016-11-24 13:09:07]

Description was changed from

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

to

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller) -
that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

[whywhat, 2016-11-24 13:09:27]

Description was changed from

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller) -
that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

to

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller)
- that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

[Zhiqiang Zhang (Slow), 2016-11-24 13:24:47]

On 2016/11/24 13:06:46, whywhat_OOO_till_Mon_Nov_28 wrote:
> On 2016/11/24 at 11:08:48, zqzhang wrote:
> > The rebasing sgtm, but is it a pure structural change without any logical
> change? How does it fix http://crbug.com/667269
> 
> Sorry, the description is confusing because of the long class names I assume.
> The Fragment subclass that we use for device picker was inheriting through the
> common base Fragment that inherited from the Android's MR_Chooser_DlgFragment
> (underscores are for emphasis on the important part of the name).
> Unfortunately, using the common base class meant that the subclass we had for
> controlling the connected session was also inherited from the _chooser_
> fragment.
> So I copied the code from the common base class into each individual subclass
-
> that's no logic change; but then I was able to inherit the latter Fragment
> subclass from the _controller_ dialog fragment which fixes the bug.
> 
> This was a very subtle mistake that I noticed accidentally after three days of
> debugging :)

I see. Thanks for the explanation! lgtm :)

[whywhat, 2016-11-25 16:19:48]

The CQ bit was checked by avayvod@chromium.org

[commit-bot: I haz the power, 2016-11-25 16:20:03]

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-11-25 16:55:53]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1480090788713220, "parent_rev":
"71f8e75210de216592df27c7ddb6d5b9f02ad499", "commit_rev":
"ca6a9a64a7caecfa3f61b030d5f8fb3d4fb0173a"}

[commit-bot: I haz the power, 2016-11-25 16:56:17]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-11-25 16:57:45]

Description was changed from

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller)
- that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org
==========

to

==========
[MediaRouter, Android] Rebase the controller dialog fragment.

MediaRouteControllerDialogManager.Fragment inherits from
BaseMediaRouteDialogManager.Fragment which inherits from
MediaRouteChooserDialogFragment. I changed the former to inherit
directly from the MediaRouteControllerDialogFragment and merged the base
dialog fragment logic with both Chrome's custom fragment classes.

In the essence, the rebasing is needed so that two final subclasses could
inherit from the right MediaRouteXXXDialogFragment (Chooser and Controller)
- that's the only behavioral change that fixes the problem.

BUG=667269
TEST=manual on any cast-enabled mobile-friendly website.
TBR=mlamouri@chromium.org

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

[commit-bot: I haz the power, 2016-11-25 16:57:46]

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