Adds missing and removes duplicate tracing macros.

Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
NOPRESUBMIT=true
CQ_EXCLUDE_TRYBOTS=client.skia.fyi:skia_presubmit-Trybot

Committed: https://skia.googlesource.com/skia/+/4a56318d4c771de50194700083cc1acee0a66fa4

[carlosk, 2016-09-09 00:20:45]

Description was changed from

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=skia:645308
==========

to

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=skia:645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
==========

[carlosk, 2016-09-09 00:21:44]

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

[commit-bot: I haz the power, 2016-09-09 00:21:52]

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-09-09 00:23:22]

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

[commit-bot: I haz the power, 2016-09-09 00:23:22]

Dry run: Try jobs failed on following builders:
  skia_presubmit-Trybot on master.client.skia.fyi (JOB_FAILED,
http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/bu...)

[carlosk, 2016-09-09 00:54:31]

carlosk@chromium.org changed reviewers:
+ reed@google.com

[carlosk, 2016-09-09 00:54:32]

reed@: PTAL.

On that hooks check failure: I don't know if I can avoid it and I don't think
it's correct as this file doesn't include anything.

[carlosk, 2016-09-09 00:55:10]

Description was changed from

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=skia:645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
==========

to

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
==========

[reed1, 2016-09-09 14:56:10]

lgtm

[carlosk, 2016-09-09 23:05:28]

The CQ bit was checked by carlosk@chromium.org

[commit-bot: I haz the power, 2016-09-09 23:05:35]

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-09-09 23:07:04]

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

[commit-bot: I haz the power, 2016-09-09 23:07:05]

Try jobs failed on following builders:
  skia_presubmit-Trybot on master.client.skia.fyi (JOB_FAILED,
http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/bu...)

[carlosk, 2016-09-09 23:14:08]

Description was changed from

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
==========

to

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
NOPRESUBMIT=true
CQ_EXCLUDE_TRYBOTS=client.skia.fyi:skia_presubmit-Trybot
==========

[carlosk, 2016-09-09 23:14:53]

The CQ bit was checked by carlosk@chromium.org

[commit-bot: I haz the power, 2016-09-09 23:15:04]

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-09-09 23:15:20]

Description was changed from

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
NOPRESUBMIT=true
CQ_EXCLUDE_TRYBOTS=client.skia.fyi:skia_presubmit-Trybot
==========

to

==========
Adds missing and removes duplicate tracing macros.

This fixes the missing tracing nested instant call without any arguments and
removes the duplicate of the one with 2 arguments.

This is a follow up on https://crrev.com/2326483004

BUG=645308
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2321283002
NOPRESUBMIT=true
CQ_EXCLUDE_TRYBOTS=client.skia.fyi:skia_presubmit-Trybot

Committed:
https://skia.googlesource.com/skia/+/4a56318d4c771de50194700083cc1acee0a66fa4
==========

[commit-bot: I haz the power, 2016-09-09 23:15:22]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/4a56318d4c771de50194700083cc1acee0a66fa4