Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:762686
Review-Url: https://chromiumcodereview.appspot.com/3011363002
Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/ab30bb20a857ea0136d8bf5ae449ef2b58690658

[xunjieli, 2017-09-19 14:56:22]

xunjieli@chromium.org changed reviewers:
+ eroman@chromium.org

[xunjieli, 2017-09-19 14:56:23]

Eric, PTAL. Thank you! This is to downstream the changes. I looked at the code,
but I am not sure how to exactly net-internals can use JS template, which you
mentioned in a previous CL. Making net-internals and NetLog viewer
webcomponentized will make future merge easier. Maybe we can start a crbug
outlining the steps?

[eroman, 2017-09-19 17:09:25]

LGTM, thanks for doing this!

> I looked at the code, but I am not sure how to exactly net-internals can use
JS template,

The issue is that Chromium's NetLog viewer code uses JSTemplate, however the
Catapult version cannot use it (when discussing with catapult OWNERS we decided
not to import JSTemplate as a dependency).

So merging code (primarily QUIC) which is actively changing and uses JSTemplate
in Chromium is a pain.

In the short term we could ease this pain by replacing the Chromium version of
those pages with the catapult version (i.e. remove the dependency on JSTemplate
in Chromium to ease merges).

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/netlog_vi...
File netlog_viewer/netlog_viewer/browser_bridge.js (right):

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/netlog_vi...
netlog_viewer/netlog_viewer/browser_bridge.js:180:
sendDomainSecurityPolicyDelete: function(domain) {
Technically these don't really matter since they aren't supported by the
external NetLog viewer, but may as well keep the files in sync as you have done.

[eroman, 2017-09-19 17:14:19]

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/README.md
File netlog_viewer/README.md (right):

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/README.md...
netlog_viewer/README.md:10: 0036296a1128ac9cbefeaff51c8df831ec421c36.
Optional: Could you also paste in your instructions on how to do a merge? I
think that would be useful for whoever ends up doing this next!

[xunjieli, 2017-09-19 18:26:07]

> > I looked at the code, but I am not sure how to exactly net-internals can use
> JS template,
> 
> The issue is that Chromium's NetLog viewer code uses JSTemplate, however the
> Catapult version cannot use it (when discussing with catapult OWNERS we
decided
> not to import JSTemplate as a dependency).
> 
> So merging code (primarily QUIC) which is actively changing and uses
JSTemplate
> in Chromium is a pain.
> 
> In the short term we could ease this pain by replacing the Chromium version of
> those pages with the catapult version (i.e. remove the dependency on
JSTemplate
> in Chromium to ease merges).

Got it. Thanks for the context! That makes sense. I will see if we can backport
these changes and move quic_view off JSTemplate. That will definitely make
merges easier.

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/README.md
File netlog_viewer/README.md (right):

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/README.md...
netlog_viewer/README.md:10: 0036296a1128ac9cbefeaff51c8df831ec421c36.
On 2017/09/19 17:14:19, eroman wrote:
> Optional: Could you also paste in your instructions on how to do a merge? I
> think that would be useful for whoever ends up doing this next!

Done. Good point. Thanks.

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/netlog_vi...
File netlog_viewer/netlog_viewer/browser_bridge.js (right):

https://codereview.chromium.org/3011363002/diff/20001/netlog_viewer/netlog_vi...
netlog_viewer/netlog_viewer/browser_bridge.js:180:
sendDomainSecurityPolicyDelete: function(domain) {
On 2017/09/19 17:09:25, eroman wrote:
> Technically these don't really matter since they aren't supported by the
> external NetLog viewer, but may as well keep the files in sync as you have
done.

Acknowledged.

[xunjieli, 2017-09-19 18:26:25]

Description was changed from

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

BUG=chromium:#762686
==========

to

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:#762686
==========

[xunjieli, 2017-09-19 18:26:37]

The CQ bit was checked by xunjieli@chromium.org

[xunjieli, 2017-09-19 18:26:38]

The patchset sent to the CQ was uploaded after l-g-t-m from eroman@chromium.org
Link to the patchset: https://codereview.chromium.org/3011363002/#ps40001
(title: "address comments")

[commit-bot: I haz the power, 2017-09-19 18:26:40]

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, 2017-09-19 18:26:56]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1505845597366000,
"parent_rev": "86c099bf6743822659c9b445653d2eeb3c4b400c", "commit_rev":
"ab30bb20a857ea0136d8bf5ae449ef2b58690658"}

[commit-bot: I haz the power, 2017-09-19 18:26:59]

Description was changed from

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:#762686
==========

to

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:#762686

Review-Url: https://chromiumcodereview.appspot.com/3011363002
Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========

[commit-bot: I haz the power, 2017-09-19 18:27:01]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

[xunjieli, 2017-09-19 18:30:05]

Description was changed from

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:#762686

Review-Url: https://chromiumcodereview.appspot.com/3011363002
Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========

to

==========
Apply Chromium changes up to commit 0036296a1128ac9cbefeaff51c8df831ec421c36

This CL applies chromium changes to NetLog viewer.
Steps used:

1. git diff --relative --src-prefix="a/netlog_viewer/netlog_viewer/"\
--dst-prefix="b/netlog_viewer/netlog_viewer/"\
8491b5b9060b61c2b06f51bb5dfcc8098c0cbad1 \
0036296a1128ac9cbefeaff51c8df831ec421c36 . > ~/Desktop/diff.txt

2. git apply --reject --whitespace=fix ~/Desktop/diff.txt

3. Manually merge fixes in quic_view.html/js and spdy_view.html/js.

NOTRY=true
NOPRESUBMIT=true

BUG=chromium:762686

Review-Url: https://chromiumcodereview.appspot.com/3011363002
Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========