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

Side by Side Diff: net/socket/ssl_test_util.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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/base/x509_certificate_win.cc ('k') | views/controls/label.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) 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 "net/socket/ssl_test_util.h" 5 #include "net/socket/ssl_test_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 12 matching lines...) Expand all
23 #include "base/nss_util.h" 23 #include "base/nss_util.h"
24 #elif defined(OS_MACOSX) 24 #elif defined(OS_MACOSX)
25 #include <Security/Security.h> 25 #include <Security/Security.h>
26 #include "base/scoped_cftyperef.h" 26 #include "base/scoped_cftyperef.h"
27 #include "net/base/x509_certificate.h" 27 #include "net/base/x509_certificate.h"
28 #endif 28 #endif
29 29
30 #include "base/file_util.h" 30 #include "base/file_util.h"
31 #include "base/logging.h" 31 #include "base/logging.h"
32 #include "base/path_service.h" 32 #include "base/path_service.h"
33 #include "base/string_util.h" 33 #include "base/utf_string_conversions.h"
34 #include "net/base/host_resolver.h" 34 #include "net/base/host_resolver.h"
35 #include "net/base/net_test_constants.h" 35 #include "net/base/net_test_constants.h"
36 #include "net/base/test_completion_callback.h" 36 #include "net/base/test_completion_callback.h"
37 #include "net/socket/tcp_client_socket.h" 37 #include "net/socket/tcp_client_socket.h"
38 #include "net/socket/tcp_pinger.h" 38 #include "net/socket/tcp_pinger.h"
39 #include "testing/platform_test.h" 39 #include "testing/platform_test.h"
40 40
41 #if defined(OS_WIN) 41 #if defined(OS_WIN)
42 #pragma comment(lib, "crypt32.lib") 42 #pragma comment(lib, "crypt32.lib")
43 #endif 43 #endif
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 "certificate to your trusted roots for this test to work. " 435 "certificate to your trusted roots for this test to work. "
436 "For more info visit:\n" 436 "For more info visit:\n"
437 "http://dev.chromium.org/developers/testing\n"; 437 "http://dev.chromium.org/developers/testing\n";
438 return false; 438 return false;
439 } 439 }
440 #endif 440 #endif
441 return true; 441 return true;
442 } 442 }
443 443
444 } // namespace net 444 } // namespace net
OLDNEW
« no previous file with comments | « net/base/x509_certificate_win.cc ('k') | views/controls/label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698