Merge Content Settings IPCs back to chrome/common/render_messages.h

This reverts https://codereview.chromium.org/798923003 (manually, because the
context code has changed significantly). The separation of content settings
IPCs was done to prepare componentising of
chrome/renderer/content_settings_observer.cc, which was not needed in the end.
As jam@ points out in https://codereview.chromium.org/2375333003/#msg9, it
should be cleaned-up.

BUG=384874,387075

Review-Url: https://codereview.chromium.org/2387613002
Cr-Commit-Position: refs/heads/master@{#423142}


CrOS-Libchrome-Original-Commit: c5eaaddfa4a70f69796722e6f247ad5ac505818f
1 file changed
tree: bdb5be7071a8981ab700cf44b1194af0d74a5909
  1. base/
  2. build/
  3. components/
  4. dbus/
  5. device/
  6. ipc/
  7. mojo/
  8. testing/
  9. third_party/
  10. ui/