diff options
| author | hanxi <hanxi@chromium.org> | 2014-10-09 06:27:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 13:27:32 +0000 |
| commit | 3328d99286e14e8c31b922c995fb7de7804bba69 (patch) | |
| tree | 48663f478ded6b62f3999937e879dddb930cdd4a /extensions/extensions.gyp | |
| parent | 3c200fad33da10ca7b7bda1bba471d80ac570649 (diff) | |
| download | chromium_src-3328d99286e14e8c31b922c995fb7de7804bba69.zip chromium_src-3328d99286e14e8c31b922c995fb7de7804bba69.tar.gz chromium_src-3328d99286e14e8c31b922c995fb7de7804bba69.tar.bz2 | |
Fix bug: AppShell: CHECK failure in PeerConnection init.
The bug was caused due to a missing step to reset the url_request_getter in resource_context_ after initializing a url_request_context_getter in extensions::ShellBrowserContext, refer to CL (https://codereview.chromium.org/615583003/). To fix this bug, a refactor is done in this CL, including:
- ExtensionURLRequestContextGetter was originally implemented in the wrong directory. It's only used by app_shell, hence it belongs in extensions/shell/browser. Rename and move ExtensionURLRequestContextGetter to extensions::ShellURLRequestContextGetter and put it in extensions/shell/browser. Also share code as much as possible with content::ShellURLRequestContextGetter;
- Rename and move ExtensionNetworkDelegate to extensions::ShellNetworkDelegate and live in extensions/shell/browser;
- Reuse content/shell/common/shell_switches.h for kDumpRenderTree.
BUG=420698
Review URL: https://codereview.chromium.org/631203003
Cr-Commit-Position: refs/heads/master@{#298862}
Diffstat (limited to 'extensions/extensions.gyp')
| -rw-r--r-- | extensions/extensions.gyp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index ac1eb6e..166937f 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -595,8 +595,6 @@ 'browser/extension_icon_image.h', 'browser/extension_message_filter.cc', 'browser/extension_message_filter.h', - 'browser/extension_network_delegate.cc', - 'browser/extension_network_delegate.h', 'browser/extension_pref_store.cc', 'browser/extension_pref_store.h', 'browser/extension_pref_value_map.cc', @@ -621,8 +619,6 @@ 'browser/extension_system.h', 'browser/extension_system_provider.cc', 'browser/extension_system_provider.h', - 'browser/extension_url_request_context_getter.cc', - 'browser/extension_url_request_context_getter.h', 'browser/extension_util.cc', 'browser/extension_util.h', 'browser/extension_web_contents_observer.cc', |