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

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/ssl/ssl_error_info.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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 30 matching lines...) Expand all
41 #include "net/base/crypto_module.h" 41 #include "net/base/crypto_module.h"
42 #include "net/base/net_errors.h" 42 #include "net/base/net_errors.h"
43 #include "net/base/test_data_directory.h" 43 #include "net/base/test_data_directory.h"
44 #include "net/cert/cert_status_flags.h" 44 #include "net/cert/cert_status_flags.h"
45 #include "net/test/spawned_test_server/spawned_test_server.h" 45 #include "net/test/spawned_test_server/spawned_test_server.h"
46 46
47 #if defined(USE_NSS) 47 #if defined(USE_NSS)
48 #include "net/cert/nss_cert_database.h" 48 #include "net/cert/nss_cert_database.h"
49 #endif // defined(USE_NSS) 49 #endif // defined(USE_NSS)
50 50
51 using base::ASCIIToUTF16;
51 using content::InterstitialPage; 52 using content::InterstitialPage;
52 using content::NavigationController; 53 using content::NavigationController;
53 using content::NavigationEntry; 54 using content::NavigationEntry;
54 using content::SSLStatus; 55 using content::SSLStatus;
55 using content::WebContents; 56 using content::WebContents;
56 using web_modal::WebContentsModalDialogManager; 57 using web_modal::WebContentsModalDialogManager;
57 58
58 const base::FilePath::CharType kDocRoot[] = 59 const base::FilePath::CharType kDocRoot[] =
59 FILE_PATH_LITERAL("chrome/test/data"); 60 FILE_PATH_LITERAL("chrome/test/data");
60 61
(...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 1670
1670 // Visit a page over https that contains a frame with a redirect. 1671 // Visit a page over https that contains a frame with a redirect.
1671 1672
1672 // XMLHttpRequest insecure content in synchronous mode. 1673 // XMLHttpRequest insecure content in synchronous mode.
1673 1674
1674 // XMLHttpRequest insecure content in asynchronous mode. 1675 // XMLHttpRequest insecure content in asynchronous mode.
1675 1676
1676 // XMLHttpRequest over bad ssl in synchronous mode. 1677 // XMLHttpRequest over bad ssl in synchronous mode.
1677 1678
1678 // XMLHttpRequest over OK ssl in synchronous mode. 1679 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/ssl/ssl_error_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698