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

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

Issue 9034032: And now NewRunnableMethod(), you die. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_frame_automation Created 8 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
« no previous file with comments | « media/video/capture/video_capture_proxy.h ('k') | remoting/host/plugin/host_script_object.h » ('j') | 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) 2011 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 "net/proxy/proxy_config_service_linux.h" 5 #include "net/proxy/proxy_config_service_linux.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 net::ProxyConfigServiceLinux* config_service_; 338 net::ProxyConfigServiceLinux* config_service_;
339 339
340 // The config obtained by |io_thread_| and read back by the main 340 // The config obtained by |io_thread_| and read back by the main
341 // thread. 341 // thread.
342 net::ProxyConfig proxy_config_; 342 net::ProxyConfig proxy_config_;
343 343
344 // Return value from GetLatestProxyConfig(). 344 // Return value from GetLatestProxyConfig().
345 net::ProxyConfigService::ConfigAvailability get_latest_config_result_; 345 net::ProxyConfigService::ConfigAvailability get_latest_config_result_;
346 }; 346 };
347 347
348 DISABLE_RUNNABLE_METHOD_REFCOUNT(SynchConfigGetter);
349
350 namespace net { 348 namespace net {
351 349
352 // This test fixture is only really needed for the KDEConfigParser test case, 350 // This test fixture is only really needed for the KDEConfigParser test case,
353 // but all the test cases with the same prefix ("ProxyConfigServiceLinuxTest") 351 // but all the test cases with the same prefix ("ProxyConfigServiceLinuxTest")
354 // must use the same test fixture class (also "ProxyConfigServiceLinuxTest"). 352 // must use the same test fixture class (also "ProxyConfigServiceLinuxTest").
355 class ProxyConfigServiceLinuxTest : public PlatformTest { 353 class ProxyConfigServiceLinuxTest : public PlatformTest {
356 protected: 354 protected:
357 virtual void SetUp() OVERRIDE { 355 virtual void SetUp() OVERRIDE {
358 PlatformTest::SetUp(); 356 PlatformTest::SetUp();
359 // Set up a temporary KDE home directory. 357 // Set up a temporary KDE home directory.
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 ProxyConfig config; 1542 ProxyConfig config;
1545 sync_config_getter.SetupAndInitialFetch(); 1543 sync_config_getter.SetupAndInitialFetch();
1546 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, 1544 EXPECT_EQ(ProxyConfigService::CONFIG_VALID,
1547 sync_config_getter.SyncGetLatestProxyConfig(&config)); 1545 sync_config_getter.SyncGetLatestProxyConfig(&config));
1548 EXPECT_TRUE(config.auto_detect()); 1546 EXPECT_TRUE(config.auto_detect());
1549 EXPECT_EQ(GURL(), config.pac_url()); 1547 EXPECT_EQ(GURL(), config.pac_url());
1550 } 1548 }
1551 } 1549 }
1552 1550
1553 } // namespace net 1551 } // namespace net
OLDNEW
« no previous file with comments | « media/video/capture/video_capture_proxy.h ('k') | remoting/host/plugin/host_script_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698