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

Side by Side Diff: net/base/registry_controlled_domains/registry_controlled_domain.cc

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and revert nss_ocsp.cc changes Created 7 years, 5 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) 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 // NB: Modelled after Mozilla's code (originally written by Pamela Greene, 5 // NB: Modelled after Mozilla's code (originally written by Pamela Greene,
6 // later modified by others), but almost entirely rewritten for Chrome. 6 // later modified by others), but almost entirely rewritten for Chrome.
7 // (netwerk/dns/src/nsEffectiveTLDService.cpp) 7 // (netwerk/dns/src/nsEffectiveTLDService.cpp)
8 /* ***** BEGIN LICENSE BLOCK ***** 8 /* ***** BEGIN LICENSE BLOCK *****
9 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 9 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
10 * 10 *
(...skipping 30 matching lines...) Expand all
41 * the provisions above, a recipient may use your version of this file under 41 * the provisions above, a recipient may use your version of this file under
42 * the terms of any one of the MPL, the GPL or the LGPL. 42 * the terms of any one of the MPL, the GPL or the LGPL.
43 * 43 *
44 * ***** END LICENSE BLOCK ***** */ 44 * ***** END LICENSE BLOCK ***** */
45 45
46 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 46 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
47 47
48 #include "base/logging.h" 48 #include "base/logging.h"
49 #include "base/strings/string_util.h" 49 #include "base/strings/string_util.h"
50 #include "base/strings/utf_string_conversions.h" 50 #include "base/strings/utf_string_conversions.h"
51 #include "googleurl/src/gurl.h"
52 #include "googleurl/src/url_parse.h"
53 #include "net/base/net_module.h" 51 #include "net/base/net_module.h"
54 #include "net/base/net_util.h" 52 #include "net/base/net_util.h"
53 #include "url/gurl.h"
54 #include "url/url_parse.h"
55 55
56 #include "effective_tld_names.cc" 56 #include "effective_tld_names.cc"
57 57
58 namespace net { 58 namespace net {
59 namespace registry_controlled_domains { 59 namespace registry_controlled_domains {
60 60
61 namespace { 61 namespace {
62 62
63 const int kExceptionRule = 1; 63 const int kExceptionRule = 1;
64 const int kWildcardRule = 2; 64 const int kWildcardRule = 2;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } 265 }
266 266
267 void SetFindDomainFunctionAndStringPoolForTesting(FindDomainPtr function, 267 void SetFindDomainFunctionAndStringPoolForTesting(FindDomainPtr function,
268 const char* stringpool) { 268 const char* stringpool) {
269 g_find_domain_function = function ? function : kDefaultFindDomainFunction; 269 g_find_domain_function = function ? function : kDefaultFindDomainFunction;
270 g_stringpool = stringpool ? stringpool : kDefaultStringPool; 270 g_stringpool = stringpool ? stringpool : kDefaultStringPool;
271 } 271 }
272 272
273 } // namespace registry_controlled_domains 273 } // namespace registry_controlled_domains
274 } // namespace net 274 } // namespace net
OLDNEW
« no previous file with comments | « net/base/network_change_notifier.cc ('k') | net/base/registry_controlled_domains/registry_controlled_domain_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698