net/net.gypi - Issue 706203003: Update from https://crrev.com/303153

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/net.gypi

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/net.gypi

diff --git a/net/net.gypi b/net/net.gypi

index e3068beaa30f3975a2156178cfa0fa130b333679..f43c67facccdef3fba9716f29fc30c12c45cad14 100644

--- a/net/net.gypi

+++ b/net/net.gypi

@@ -273,10 +273,10 @@

'base/proxy_delegate.h',

'base/request_priority.cc',

'base/request_priority.h',

- 'base/sdch_dictionary_fetcher.cc',

- 'base/sdch_dictionary_fetcher.h',

'base/sdch_manager.cc',

'base/sdch_manager.h',

+ 'base/sdch_observer.cc',

+ 'base/sdch_observer.h',

'base/static_cookie_policy.cc',

'base/static_cookie_policy.h',

'base/test_data_stream.cc',

@@ -656,7 +656,6 @@

'http/http_status_code.cc',

'http/http_status_code.h',

'http/http_stream.h',

- 'http/http_stream_base.h',

'http/http_stream_factory.cc',

'http/http_stream_factory.h',

'http/http_stream_factory_impl.cc',

@@ -1138,6 +1137,8 @@

'url_request/http_user_agent_settings.h',

'url_request/redirect_info.cc',

'url_request/redirect_info.h',

+ 'url_request/sdch_dictionary_fetcher.cc',

+ 'url_request/sdch_dictionary_fetcher.h',

'url_request/static_http_user_agent_settings.cc',

'url_request/static_http_user_agent_settings.h',

'url_request/url_fetcher.cc',

@@ -1296,7 +1297,6 @@

'base/prioritized_dispatcher_unittest.cc',

'base/priority_queue_unittest.cc',

'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',

- 'base/sdch_dictionary_fetcher_unittest.cc',

'base/sdch_manager_unittest.cc',

'base/static_cookie_policy_unittest.cc',

'base/test_completion_callback_unittest.cc',

@@ -1695,6 +1695,7 @@

'tools/dump_cache/url_utilities_unittest.cc',

'tools/tld_cleanup/tld_cleanup_util_unittest.cc',

'udp/udp_socket_unittest.cc',

+ 'url_request/sdch_dictionary_fetcher_unittest.cc',

'url_request/url_fetcher_impl_unittest.cc',

'url_request/url_fetcher_response_writer_unittest.cc',

'url_request/url_request_context_builder_unittest.cc',

« no previous file with comments | « net/net.gyp ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »