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

Side by Side Diff: net/base/net_util_posix.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
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/net_util_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/net_util.h" 5 #include "net/base/net_util.h"
6 6
7 #include <sys/types.h> 7 #include <sys/types.h>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/posix/eintr_wrapper.h" 11 #include "base/posix/eintr_wrapper.h"
12 #include "base/strings/string_tokenizer.h" 12 #include "base/strings/string_tokenizer.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/threading/thread_restrictions.h" 14 #include "base/threading/thread_restrictions.h"
15 #include "googleurl/src/gurl.h"
16 #include "net/base/escape.h" 15 #include "net/base/escape.h"
17 #include "net/base/ip_endpoint.h" 16 #include "net/base/ip_endpoint.h"
18 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
18 #include "url/gurl.h"
19 19
20 #if !defined(OS_ANDROID) 20 #if !defined(OS_ANDROID)
21 #include <ifaddrs.h> 21 #include <ifaddrs.h>
22 #endif 22 #endif
23 #include <net/if.h> 23 #include <net/if.h>
24 #include <netinet/in.h> 24 #include <netinet/in.h>
25 25
26 #if defined(OS_ANDROID) 26 #if defined(OS_ANDROID)
27 #include "net/android/network_library.h" 27 #include "net/android/network_library.h"
28 #endif 28 #endif
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 return true; 145 return true;
146 #endif 146 #endif
147 } 147 }
148 148
149 WifiPHYLayerProtocol GetWifiPHYLayerProtocol() { 149 WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
150 return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN; 150 return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN;
151 } 151 }
152 152
153 } // namespace net 153 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/net_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698