net/proxy/proxy_resolver_v8_unittest.cc - Issue 27160: Reverting 10251.

Side by Side Diff

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

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

Side by Side Diff: net/proxy/proxy_resolver_v8_unittest.cc

Issue 27160: Reverting 10251. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « net/net.xcodeproj/project.pbxproj ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/file_util.h"	5 #include "base/file_util.h"

6 #include "base/logging.h"	6 #include "base/logging.h"

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "net/base/net_errors.h"	8 #include "net/base/net_errors.h"

9 #include "net/base/net_util.h"	9 #include "net/base/net_util.h"

10 #include "net/proxy/proxy_resolver_v8.h"	10 #include "net/proxy/proxy_resolver_v8.h"

(...skipping 211 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
222 resolver.SetPacScript(std::string());	222 resolver.SetPacScript(std::string());

223	223

224 // Resolve should fail again now.	224 // Resolve should fail again now.

225 result = resolver.GetProxyForURL(kQueryUrl, kPacUrl, &proxy_info);	225 result = resolver.GetProxyForURL(kQueryUrl, kPacUrl, &proxy_info);

226 EXPECT_EQ(net::ERR_FAILED, result);	226 EXPECT_EQ(net::ERR_FAILED, result);

227	227

228 // Load a good script once more.	228 // Load a good script once more.

229 InitWithScriptFromDisk(&resolver, "direct.js");	229 InitWithScriptFromDisk(&resolver, "direct.js");

230 result = resolver.GetProxyForURL(kQueryUrl, kPacUrl, &proxy_info);	230 result = resolver.GetProxyForURL(kQueryUrl, kPacUrl, &proxy_info);

231 EXPECT_EQ(net::OK, result);	231 EXPECT_EQ(net::OK, result);

232 }	232 }

	233

OLD	NEW