Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

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

Issue 6338002: net: Remove typedef net::URLRequestContext URLRequestContext; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for real Created 9 years, 11 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <vector> 5 #include <vector>
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "net/base/net_errors.h" 9 #include "net/base/net_errors.h"
10 #include "net/base/net_log.h" 10 #include "net/base/net_log.h"
11 #include "net/base/net_log_unittest.h" 11 #include "net/base/net_log_unittest.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const Rules::Rule& rule = rules_->GetRuleByUrl(url); 100 const Rules::Rule& rule = rules_->GetRuleByUrl(url);
101 int rv = rule.fetch_error; 101 int rv = rule.fetch_error;
102 EXPECT_NE(ERR_UNEXPECTED, rv); 102 EXPECT_NE(ERR_UNEXPECTED, rv);
103 if (rv == OK) 103 if (rv == OK)
104 *text = rule.text(); 104 *text = rule.text();
105 return rv; 105 return rv;
106 } 106 }
107 107
108 virtual void Cancel() {} 108 virtual void Cancel() {}
109 109
110 virtual URLRequestContext* GetRequestContext() { return NULL; } 110 virtual net::URLRequestContext* GetRequestContext() { return NULL; }
wtc 2011/01/15 17:54:23 Undo the changes to this file because it's already
111 111
112 private: 112 private:
113 const Rules* rules_; 113 const Rules* rules_;
114 }; 114 };
115 115
116 class RuleBasedProxyResolver : public ProxyResolver { 116 class RuleBasedProxyResolver : public ProxyResolver {
117 public: 117 public:
118 RuleBasedProxyResolver(const Rules* rules, bool expects_pac_bytes) 118 RuleBasedProxyResolver(const Rules* rules, bool expects_pac_bytes)
119 : ProxyResolver(expects_pac_bytes), rules_(rules) {} 119 : ProxyResolver(expects_pac_bytes), rules_(rules) {}
120 120
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 EXPECT_TRUE(LogContainsBeginEvent( 502 EXPECT_TRUE(LogContainsBeginEvent(
503 entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT)); 503 entries, 1, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
504 EXPECT_TRUE(LogContainsEndEvent( 504 EXPECT_TRUE(LogContainsEndEvent(
505 entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT)); 505 entries, 2, NetLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT));
506 EXPECT_TRUE(LogContainsEndEvent( 506 EXPECT_TRUE(LogContainsEndEvent(
507 entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER)); 507 entries, 3, NetLog::TYPE_INIT_PROXY_RESOLVER));
508 } 508 }
509 509
510 } // namespace 510 } // namespace
511 } // namespace net 511 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698