[MD settings] name Content settings separately from site settings

[MD settings] name Content settings separately from site settings

This CL puts the 'site settings' name behind the enable-site-settings
flag. When site settings is disabled, the name 'content settings' is
used.

BUG=654940
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

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

[dschuyler, 2016-10-18 00:15:12]

Description was changed from

==========
[MD settings] name Content settings separately from site settings

This CL puts the 'site settings' name behind the enable-site-settings
flag. When site settings is disabled, the name 'content settings' is
used.

BUG=654940
==========

to

==========
[MD settings] name Content settings separately from site settings

This CL puts the 'site settings' name behind the enable-site-settings
flag. When site settings is disabled, the name 'content settings' is
used.

BUG=654940
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
==========

[dschuyler, 2016-10-18 00:15:16]

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

[commit-bot: I haz the power, 2016-10-18 00:15:46]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dschuyler, 2016-10-18 00:19:13]

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

[dschuyler, 2016-10-18 00:19:25]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-10-18 00:19:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[dschuyler, 2016-10-18 00:19:55]

dschuyler@chromium.org changed reviewers:
+ dbeam@chromium.org

[Dan Beam, 2016-10-18 00:41:53]

lgtm

[commit-bot: I haz the power, 2016-10-18 03:07:48]

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

[commit-bot: I haz the power, 2016-10-18 03:07:49]

Dry run: This issue passed the CQ dry run.

[dschuyler, 2016-10-18 18:21:47]

The CQ bit was checked by dschuyler@chromium.org

[commit-bot: I haz the power, 2016-10-18 18:47: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-10-18 18:55:11]

Committed patchset #1 (id:20001)

[commit-bot: I haz the power, 2016-10-21 13:01:56]

Description was changed from

==========
[MD settings] name Content settings separately from site settings

This CL puts the 'site settings' name behind the enable-site-settings
flag. When site settings is disabled, the name 'content settings' is
used.

BUG=654940
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
==========

to

==========
[MD settings] name Content settings separately from site settings

This CL puts the 'site settings' name behind the enable-site-settings
flag. When site settings is disabled, the name 'content settings' is
used.

BUG=654940
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

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

[commit-bot: I haz the power, 2016-10-21 13:01:57]

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