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

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

Issue 248021: Reverting 27379. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 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 | « ipc/ipc_sync_channel_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "net/proxy/proxy_config_service_linux.h" 9 #include "net/proxy/proxy_config_service_linux.h"
10 10
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 base::Thread io_thread_; 302 base::Thread io_thread_;
303 303
304 net::ProxyConfigServiceLinux* config_service_; 304 net::ProxyConfigServiceLinux* config_service_;
305 305
306 // The config obtained by |io_thread_| and read back by the main 306 // The config obtained by |io_thread_| and read back by the main
307 // thread. 307 // thread.
308 net::ProxyConfig proxy_config_; 308 net::ProxyConfig proxy_config_;
309 int get_config_result_; // Return value from GetProxyConfig(). 309 int get_config_result_; // Return value from GetProxyConfig().
310 }; 310 };
311 311
312 template <> 312 template<>
313 struct RunnableMethodTraits<SynchConfigGetter> { 313 void RunnableMethodTraits<SynchConfigGetter>::RetainCallee(
314 void RetainCallee(SynchConfigGetter*) {} 314 SynchConfigGetter* remover) {}
315 void ReleaseCallee(SynchConfigGetter*) {} 315 template<>
316 }; 316 void RunnableMethodTraits<SynchConfigGetter>::ReleaseCallee(
317 SynchConfigGetter* remover) {}
317 318
318 namespace net { 319 namespace net {
319 320
320 // This test fixture is only really needed for the KDEConfigParser test case, 321 // This test fixture is only really needed for the KDEConfigParser test case,
321 // but all the test cases with the same prefix ("ProxyConfigServiceLinuxTest") 322 // but all the test cases with the same prefix ("ProxyConfigServiceLinuxTest")
322 // must use the same test fixture class (also "ProxyConfigServiceLinuxTest"). 323 // must use the same test fixture class (also "ProxyConfigServiceLinuxTest").
323 class ProxyConfigServiceLinuxTest : public PlatformTest { 324 class ProxyConfigServiceLinuxTest : public PlatformTest {
324 protected: 325 protected:
325 virtual void SetUp() { 326 virtual void SetUp() {
326 PlatformTest::SetUp(); 327 PlatformTest::SetUp();
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
1203 EXPECT_EQ(tests[i].auto_detect, config.auto_detect); 1204 EXPECT_EQ(tests[i].auto_detect, config.auto_detect);
1204 EXPECT_EQ(tests[i].pac_url, config.pac_url); 1205 EXPECT_EQ(tests[i].pac_url, config.pac_url);
1205 EXPECT_EQ(tests[i].proxy_bypass_list, 1206 EXPECT_EQ(tests[i].proxy_bypass_list,
1206 FlattenProxyBypass(config.proxy_bypass)); 1207 FlattenProxyBypass(config.proxy_bypass));
1207 EXPECT_EQ(tests[i].bypass_local_names, config.proxy_bypass_local_names); 1208 EXPECT_EQ(tests[i].bypass_local_names, config.proxy_bypass_local_names);
1208 EXPECT_EQ(tests[i].proxy_rules, config.proxy_rules); 1209 EXPECT_EQ(tests[i].proxy_rules, config.proxy_rules);
1209 } 1210 }
1210 } 1211 }
1211 1212
1212 } // namespace net 1213 } // namespace net
OLDNEW
« no previous file with comments | « ipc/ipc_sync_channel_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698