diff options
| author | dimich <dimich@chromium.org> | 2016-03-02 15:15:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 23:16:58 +0000 |
| commit | 08ebff81c084613192bd3e0b79613e394ffb2aa7 (patch) | |
| tree | 6fbe8938e1ecb4187e219ccad9dcb90d861cd89f /components/safe_json | |
| parent | 53eccbc71cfc0b6f715d595888d6850d38b013c0 (diff) | |
| download | chromium_src-08ebff81c084613192bd3e0b79613e394ffb2aa7.zip chromium_src-08ebff81c084613192bd3e0b79613e394ffb2aa7.tar.gz chromium_src-08ebff81c084613192bd3e0b79613e394ffb2aa7.tar.bz2 | |
Revert of Mustash: Move GURL ParamTraits to url/ipc (patchset #18 id:330001 of https://codereview.chromium.org/1722773002/ )
Reason for revert:
Broke compile on iOS_Simulator_GN_(dbg): https://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_GN_%28dbg%29/builds/1777
Original issue's description:
> Move GURL ParamTraits to url/ipc
>
> As a part of the GPU refactor for Mus, we are trying to eliminate spots where content/common/gpu depends on
> content/. One such dependency is GURL. As per discussion here:
> https://codereview.chromium.org/1703163002/, the plan of record is to move
> GURL ParamTraits out of content/ and into url/.
>
> BUG=586368
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
>
> Committed: https://crrev.com/45eb2e749a8b08988ab45bfd6806c004e9f511fa
> Cr-Commit-Position: refs/heads/master@{#378859}
TBR=fsamuel@chromium.org,piman@chromium.org,brettw@chromium.org,tsepez@chromium.org,thakis@chromium.org,markdittmer@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=586368
Review URL: https://codereview.chromium.org/1755363003
Cr-Commit-Position: refs/heads/master@{#378869}
Diffstat (limited to 'components/safe_json')
| -rw-r--r-- | components/safe_json/safe_json_parser_messages.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/safe_json/safe_json_parser_messages.h b/components/safe_json/safe_json_parser_messages.h index 6b405c7..ad92795 100644 --- a/components/safe_json/safe_json_parser_messages.h +++ b/components/safe_json/safe_json_parser_messages.h @@ -8,6 +8,8 @@ #include <vector> #include "base/strings/string16.h" +#include "content/public/common/common_param_traits.h" +#include "content/public/common/common_param_traits_macros.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" |