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

Side by Side Diff: net/base/transport_security_state.cc

Issue 3076013: Move ASCIIToWide and ASCIIToUTF16 to utf_string_conversions.h. I've found it... (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) 2009 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/base/transport_security_state.h" 5 #include "net/base/transport_security_state.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "base/sha2.h" 12 #include "base/sha2.h"
13 #include "base/string_tokenizer.h" 13 #include "base/string_tokenizer.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 16 #include "base/values.h"
16 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
17 #include "net/base/dns_util.h" 18 #include "net/base/dns_util.h"
18 19
19 namespace net { 20 namespace net {
20 21
21 TransportSecurityState::TransportSecurityState() 22 TransportSecurityState::TransportSecurityState()
22 : delegate_(NULL) { 23 : delegate_(NULL) {
23 } 24 }
24 25
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 *include_subdomains = kPreloadedSTS[j].include_subdomains; 416 *include_subdomains = kPreloadedSTS[j].include_subdomains;
416 return true; 417 return true;
417 } 418 }
418 } 419 }
419 } 420 }
420 421
421 return false; 422 return false;
422 } 423 }
423 424
424 } // namespace 425 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698