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

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

Issue 5977010: Move CancellationFlag and WaitableEvent to the synchronization subdirectory.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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
« no previous file with comments | « net/proxy/multi_threaded_proxy_resolver_unittest.cc ('k') | net/proxy/proxy_service.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/format_macros.h" 13 #include "base/format_macros.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/stringprintf.h" 16 #include "base/stringprintf.h"
17 #include "base/task.h" 17 #include "base/task.h"
18 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
19 #include "base/waitable_event.h" 19 #include "base/synchronization/waitable_event.h"
20 #include "net/proxy/proxy_config.h" 20 #include "net/proxy/proxy_config.h"
21 #include "net/proxy/proxy_config_service_common_unittest.h" 21 #include "net/proxy/proxy_config_service_common_unittest.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 #include "testing/platform_test.h" 23 #include "testing/platform_test.h"
24 24
25 namespace net { 25 namespace net {
26 namespace { 26 namespace {
27 27
28 // Set of values for all environment variables that we might 28 // Set of values for all environment variables that we might
29 // query. NULL represents an unset variable. 29 // query. NULL represents an unset variable.
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 new ProxyConfigServiceLinux(env)); 1401 new ProxyConfigServiceLinux(env));
1402 ProxyConfig config; 1402 ProxyConfig config;
1403 sync_config_getter.SetupAndInitialFetch(); 1403 sync_config_getter.SetupAndInitialFetch();
1404 sync_config_getter.SyncGetLatestProxyConfig(&config); 1404 sync_config_getter.SyncGetLatestProxyConfig(&config);
1405 EXPECT_TRUE(config.auto_detect()); 1405 EXPECT_TRUE(config.auto_detect());
1406 EXPECT_EQ(GURL(), config.pac_url()); 1406 EXPECT_EQ(GURL(), config.pac_url());
1407 } 1407 }
1408 } 1408 }
1409 1409
1410 } // namespace net 1410 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/multi_threaded_proxy_resolver_unittest.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698