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

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

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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) 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_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h"
12 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
13 #include "net/base/net_log.h" 14 #include "net/base/net_log.h"
14 #include "net/base/net_log_unittest.h" 15 #include "net/base/net_log_unittest.h"
15 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
16 #include "net/base/test_completion_callback.h" 17 #include "net/base/test_completion_callback.h"
17 #include "net/proxy/mock_proxy_resolver.h" 18 #include "net/proxy/mock_proxy_resolver.h"
18 #include "net/proxy/proxy_config_service.h" 19 #include "net/proxy/proxy_config_service.h"
19 #include "net/proxy/proxy_resolver.h" 20 #include "net/proxy/proxy_resolver.h"
20 #include "net/proxy/proxy_script_fetcher.h" 21 #include "net/proxy/proxy_script_fetcher.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 // Complete the pending second request. 1664 // Complete the pending second request.
1664 resolver->pending_requests()[0]->results()->UseNamedProxy("request2:80"); 1665 resolver->pending_requests()[0]->results()->UseNamedProxy("request2:80");
1665 resolver->pending_requests()[0]->CompleteNow(OK); 1666 resolver->pending_requests()[0]->CompleteNow(OK);
1666 1667
1667 // Wait for completion callback, and verify that the request ran as expected. 1668 // Wait for completion callback, and verify that the request ran as expected.
1668 EXPECT_EQ(OK, callback2.WaitForResult()); 1669 EXPECT_EQ(OK, callback2.WaitForResult());
1669 EXPECT_EQ("request2:80", info2.proxy_server().ToURI()); 1670 EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
1670 } 1671 }
1671 1672
1672 } // namespace net 1673 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_script_fetcher_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698