net/proxy/proxy_service.cc - Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones.

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/proxy/proxy_service.cc

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and revert nss_ocsp.cc changes Created 7 years, 5 months ago

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

Jump to:

Index: net/proxy/proxy_service.cc

diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc

index 20710ca19dd29953738f55d3034a978adebbd931..3054b23a1e7896b340eb60f0db9cab533a73ac70 100644

--- a/net/proxy/proxy_service.cc

+++ b/net/proxy/proxy_service.cc

@@ -16,7 +16,6 @@

#include "base/strings/string_util.h"

#include "base/thread_task_runner_handle.h"

#include "base/values.h"

-#include "googleurl/src/gurl.h"

#include "net/base/completion_callback.h"

#include "net/base/net_errors.h"

#include "net/base/net_log.h"

@@ -29,6 +28,7 @@

#include "net/proxy/proxy_script_decider.h"

#include "net/proxy/proxy_script_fetcher.h"

#include "net/url_request/url_request_context.h"

+#include "url/gurl.h"

#if defined(OS_WIN)

#include "net/proxy/proxy_config_service_win.h"

« no previous file with comments | « net/proxy/proxy_script_decider.h ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »