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

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

Issue 1969043002: Fix include path for moved thread_task_runner_handle.h header in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: Created 4 years, 7 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
« no previous file with comments | « net/proxy/polling_proxy_config_service.cc ('k') | net/proxy/proxy_resolver_v8_tracing.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 11 #include "base/bind.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/format_macros.h" 15 #include "base/format_macros.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "base/synchronization/waitable_event.h" 21 #include "base/synchronization/waitable_event.h"
22 #include "base/thread_task_runner_handle.h"
23 #include "base/threading/thread.h" 22 #include "base/threading/thread.h"
23 #include "base/threading/thread_task_runner_handle.h"
24 #include "net/proxy/proxy_config.h" 24 #include "net/proxy/proxy_config.h"
25 #include "net/proxy/proxy_config_service_common_unittest.h" 25 #include "net/proxy/proxy_config_service_common_unittest.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 #include "testing/platform_test.h" 27 #include "testing/platform_test.h"
28 28
29 namespace net { 29 namespace net {
30 namespace { 30 namespace {
31 31
32 // Set of values for all environment variables that we might 32 // Set of values for all environment variables that we might
33 // query. NULL represents an unset variable. 33 // query. NULL represents an unset variable.
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, 1656 EXPECT_EQ(ProxyConfigService::CONFIG_VALID,
1657 sync_config_getter.SyncGetLatestProxyConfig(&config)); 1657 sync_config_getter.SyncGetLatestProxyConfig(&config));
1658 EXPECT_FALSE(config.auto_detect()); 1658 EXPECT_FALSE(config.auto_detect());
1659 EXPECT_TRUE(slaverc5_rules.Matches(config.proxy_rules())); 1659 EXPECT_TRUE(slaverc5_rules.Matches(config.proxy_rules()));
1660 } 1660 }
1661 } 1661 }
1662 1662
1663 } // namespace 1663 } // namespace
1664 1664
1665 } // namespace net 1665 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/polling_proxy_config_service.cc ('k') | net/proxy/proxy_resolver_v8_tracing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698