Rename ComposedTree to FlatTree

Rename ComposedTree to FlatTree

The spec change is: https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad084e5f4d

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require a more careful investigation, will be done in another CL.

BUG=531990
Committed: https://crrev.com/5c496adcb1c77856494692e0ea3ca358ba2f0415
Cr-Commit-Position: refs/heads/master@{#374095}

[hayato, 2016-02-08 05:28:47]

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

[commit-bot: I haz the power, 2016-02-08 05:28:59]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1675163002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1675163002/1

[hayato, 2016-02-08 05:52:21]

Description was changed from

==========
Rename ComposedTree to FlatTree

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

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[hayato, 2016-02-08 05:52:45]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[hayato, 2016-02-08 05:53:38]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[hayato, 2016-02-08 05:53:59]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[hayato, 2016-02-08 05:55:12]

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

[hayato, 2016-02-08 05:55:17]

wip

[hayato, 2016-02-08 05:55:38]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[commit-bot: I haz the power, 2016-02-08 05:55:41]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1675163002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1675163002/20001

[hayato, 2016-02-08 05:56:23]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/Composed tree/flat tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js} -- sed -i -e 's/Composed Tree/Flat Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

[hayato, 2016-02-08 06:08:57]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require more careful investigation, will be done in
another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

[hayato, 2016-02-08 06:09:04]

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

[hayato, 2016-02-08 06:09:10]

wip

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

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1675163002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1675163002/40001

[hayato, 2016-02-08 06:09:57]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should be consistent with the the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

[hayato, 2016-02-08 06:11:04]

hayato@chromium.org changed reviewers:
+ kochi@chromium.org, tkent@chromium.org

[hayato, 2016-02-08 06:11:05]

PTAL

[hayato, 2016-02-08 06:11:28]

hayato@chromium.org changed reviewers:
+ yosin@chromium.org

[hayato, 2016-02-08 06:16:57]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

[kochi, 2016-02-08 06:33:09]

lgtm

[tkent, 2016-02-08 06:42:30]

lgtm

https://codereview.chromium.org/1675163002/diff/40001/third_party/WebKit/Layo...
File
third_party/WebKit/LayoutTests/fast/dom/shadow/getComputedStyle-composed-parent-dirty.html
(right):

https://codereview.chromium.org/1675163002/diff/40001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/dom/shadow/getComputedStyle-composed-parent-dirty.html:1:
<!DOCTYPE html>
Probably you want to rename this test file?

[commit-bot: I haz the power, 2016-02-08 07:25:26]

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

[commit-bot: I haz the power, 2016-02-08 07:25:27]

Dry run: This issue passed the CQ dry run.

[yosin_UTC9, 2016-02-08 07:37:18]

lgtm

"Flat Tree" is better than "Flatten Tree", since it is shorter.

Switching my brain to new term takes longer...
(￣_￣|||) どよ～ん

[hayato, 2016-02-08 07:42:54]

https://codereview.chromium.org/1675163002/diff/40001/third_party/WebKit/Layo...
File
third_party/WebKit/LayoutTests/fast/dom/shadow/getComputedStyle-composed-parent-dirty.html
(right):

https://codereview.chromium.org/1675163002/diff/40001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/dom/shadow/getComputedStyle-composed-parent-dirty.html:1:
<!DOCTYPE html>
On 2016/02/08 06:42:30, tkent wrote:
> Probably you want to rename this test file?

I'll rename the layout tests in another patch so that the diff of this CL looks
nice.
There are not a few layout tests we want to rename.

[hayato, 2016-02-08 07:43:03]

The CQ bit was checked by hayato@chromium.org

[commit-bot: I haz the power, 2016-02-08 07:43:16]

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

[commit-bot: I haz the power, 2016-02-08 07:50:19]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

[commit-bot: I haz the power, 2016-02-08 07:50:20]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-02-08 07:51:08]

Description was changed from

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990
==========

to

==========
Rename ComposedTree to FlatTree

The spec change is:
https://github.com/w3c/webcomponents/commit/9b7f16e90b88594ed783ff7e0f971fad0...

Blink should follow the change of the terminologies in the spec.
There is no change on web-facing APIs.

This CL is the result of the (almost) mechanical renaming, using:

> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e
's/ComposedTree/FlatTree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/composed tree/flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed tree/Flat
tree/g'
> zargs **/*.{h,cpp,gyp,gypi,idl,js,html,txt} -- sed -i -e 's/Composed Tree/Flat
Tree/g'

Other renaming, which would require a more careful investigation, will be done
in another CL.

BUG=531990

Committed: https://crrev.com/5c496adcb1c77856494692e0ea3ca358ba2f0415
Cr-Commit-Position: refs/heads/master@{#374095}
==========

[commit-bot: I haz the power, 2016-02-08 07:51:09]

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