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

Side by Side Diff: net/base/network_change_notifier.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 #include "net/base/network_change_notifier.h" 5 #include "net/base/network_change_notifier.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/synchronization/lock.h" 8 #include "base/synchronization/lock.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "googleurl/src/gurl.h"
11 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
12 #include "net/base/network_change_notifier_factory.h" 11 #include "net/base/network_change_notifier_factory.h"
13 #include "net/dns/dns_config_service.h" 12 #include "net/dns/dns_config_service.h"
14 #include "net/url_request/url_request.h" 13 #include "net/url_request/url_request.h"
14 #include "url/gurl.h"
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include "net/base/network_change_notifier_win.h" 17 #include "net/base/network_change_notifier_win.h"
18 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) 18 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
19 #include "net/base/network_change_notifier_linux.h" 19 #include "net/base/network_change_notifier_linux.h"
20 #elif defined(OS_MACOSX) 20 #elif defined(OS_MACOSX)
21 #include "net/base/network_change_notifier_mac.h" 21 #include "net/base/network_change_notifier_mac.h"
22 #endif 22 #endif
23 23
24 namespace net { 24 namespace net {
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 DCHECK(g_network_change_notifier); 704 DCHECK(g_network_change_notifier);
705 g_network_change_notifier = NULL; 705 g_network_change_notifier = NULL;
706 } 706 }
707 707
708 NetworkChangeNotifier::DisableForTest::~DisableForTest() { 708 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
709 DCHECK(!g_network_change_notifier); 709 DCHECK(!g_network_change_notifier);
710 g_network_change_notifier = network_change_notifier_; 710 g_network_change_notifier = network_change_notifier_;
711 } 711 }
712 712
713 } // namespace net 713 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_util_win.cc ('k') | net/base/registry_controlled_domains/registry_controlled_domain.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698