Merge InstantPage into InstantTab.

Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747
Committed: https://crrev.com/948c97f9e065bfb4cd9c7d4da5bb942f0a154455
Cr-Commit-Position: refs/heads/master@{#405223}

[sfiera, 2016-07-13 15:26:33]

sfiera@chromium.org changed reviewers:
+ treib@chromium.org

[sfiera, 2016-07-13 15:26:34]

This might be easier to review as two separate patches:

https://codereview.chromium.org/2146943002
https://codereview.chromium.org/2146953002

The first merges InstantTab into InstantPage, and the second renames InstantPage
to InstantTab.

[Marc Treib, 2016-07-13 15:54:04]

lgtm

The two separate patches helped, thanks!

Could you add BUG=627747?

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
File chrome/browser/ui/search/instant_controller.h (right):

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
chrome/browser/ui/search/instant_controller.h:24: class InstantTab;
nit: not required anymore

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
chrome/browser/ui/search/instant_controller.h:35: // In extended mode,
InstantController maintains and coordinates an InstantTab
nit: period at end of sentence

[sfiera, 2016-07-13 16:03:13]

Description was changed from

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.
==========

to

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747
==========

[sfiera, 2016-07-13 16:05:46]

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
File chrome/browser/ui/search/instant_controller.h (right):

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
chrome/browser/ui/search/instant_controller.h:24: class InstantTab;
On 2016/07/13 15:54:04, Marc Treib wrote:
> nit: not required anymore

Done.

https://codereview.chromium.org/2144733004/diff/20001/chrome/browser/ui/searc...
chrome/browser/ui/search/instant_controller.h:35: // In extended mode,
InstantController maintains and coordinates an InstantTab
On 2016/07/13 15:54:04, Marc Treib wrote:
> nit: period at end of sentence

Done.

[sfiera, 2016-07-13 16:05:53]

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

[commit-bot: I haz the power, 2016-07-13 16:06:18]

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-07-13 16:20:34]

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

[commit-bot: I haz the power, 2016-07-13 16:20:35]

Dry run: Try jobs failed on following builders:
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[sfiera, 2016-07-13 16:40:44]

The CQ bit was checked by sfiera@chromium.org

[sfiera, 2016-07-13 16:40:45]

The patchset sent to the CQ was uploaded after l-g-t-m from treib@chromium.org
Link to the patchset: https://codereview.chromium.org/2144733004/#ps60001
(title: "Reference new test path.")

[commit-bot: I haz the power, 2016-07-13 16:41:26]

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-07-13 16:55:22]

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

[commit-bot: I haz the power, 2016-07-13 16:55:25]

Try jobs failed on following builders:
  linux_chromium_chromeos_compile_dbg_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[sfiera, 2016-07-13 17:01:51]

The CQ bit was checked by sfiera@chromium.org

[sfiera, 2016-07-13 17:01:52]

The patchset sent to the CQ was uploaded after l-g-t-m from treib@chromium.org
Link to the patchset: https://codereview.chromium.org/2144733004/#ps80001
(title: "Fix test.")

[commit-bot: I haz the power, 2016-07-13 17:03: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-07-13 19:38:09]

Description was changed from

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747
==========

to

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747
==========

[commit-bot: I haz the power, 2016-07-13 19:38:10]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2016-07-13 19:42:05]

Description was changed from

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747
==========

to

==========
Merge InstantPage into InstantTab.

InstantPage objects are never instantiated except as InstantTab, which
is its only subclass.

BUG=627747

Committed: https://crrev.com/948c97f9e065bfb4cd9c7d4da5bb942f0a154455
Cr-Commit-Position: refs/heads/master@{#405223}
==========

[commit-bot: I haz the power, 2016-07-13 19:42:06]

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