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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/common/extension_utility_messages.h | 1 | ||||
| -rw-r--r-- | extensions/extensions.gyp | 5 | ||||
| -rw-r--r-- | extensions/utility/unpacker.cc | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/extensions/common/extension_utility_messages.h b/extensions/common/extension_utility_messages.h index 24df23f..cfaf273 100644 --- a/extensions/common/extension_utility_messages.h +++ b/extensions/common/extension_utility_messages.h @@ -10,7 +10,6 @@ #include "ipc/ipc_message_macros.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#include "url/ipc/url_param_traits.h" #define IPC_MESSAGE_START ExtensionUtilityMsgStart diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 855f50b..82e7d6a 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -68,7 +68,6 @@ '../url/url.gyp:url_lib', '../third_party/boringssl/boringssl.gyp:boringssl', '../third_party/libxml/libxml.gyp:libxml', - '../url/ipc/url_ipc.gyp:url_ipc', 'common/api/api.gyp:extensions_api', 'extensions_resources.gyp:extensions_resources', 'extensions_strings.gyp:extensions_strings', @@ -200,13 +199,9 @@ # GN version: //extensions/renderer 'target_name': 'extensions_renderer', 'type': 'static_library', - - 'defines': [ 'URL_PARAM_TRAITS_FIX' ], - 'dependencies': [ 'extensions_resources.gyp:extensions_resources', '../components/components.gyp:guest_view_renderer', - '../content/content.gyp:content_common', '../content/content.gyp:content_resources', '../gin/gin.gyp:gin', '../mojo/mojo_public.gyp:mojo_js_bindings', diff --git a/extensions/utility/unpacker.cc b/extensions/utility/unpacker.cc index 083cb72..be0a4b5 100644 --- a/extensions/utility/unpacker.cc +++ b/extensions/utility/unpacker.cc @@ -20,6 +20,7 @@ #include "base/threading/thread.h" #include "base/values.h" #include "content/public/child/image_decoder_utils.h" +#include "content/public/common/common_param_traits.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_l10n_util.h" |