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

Side by Side Diff: rlz/mac/lib/machine_id_mac.cc

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 <CoreFoundation/CoreFoundation.h> 5 #include <CoreFoundation/CoreFoundation.h>
6 #include <IOKit/IOKitLib.h> 6 #include <IOKit/IOKitLib.h>
7 #include <IOKit/network/IOEthernetController.h>
7 #include <IOKit/network/IOEthernetInterface.h> 8 #include <IOKit/network/IOEthernetInterface.h>
8 #include <IOKit/network/IONetworkInterface.h> 9 #include <IOKit/network/IONetworkInterface.h>
9 #include <IOKit/network/IOEthernetController.h>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/mac/foundation_util.h" 12 #include "base/mac/foundation_util.h"
13 #include "base/mac/scoped_cftyperef.h" 13 #include "base/mac/scoped_cftyperef.h"
14 #include "base/mac/scoped_ioobject.h" 14 #include "base/mac/scoped_ioobject.h"
15 #include "base/string16.h" 15 #include "base/string16.h"
16 #include "base/stringprintf.h" 16 #include "base/stringprintf.h"
17 #include "base/sys_string_conversions.h" 17 #include "base/strings/sys_string_conversions.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 19
20 namespace rlz_lib { 20 namespace rlz_lib {
21 21
22 namespace { 22 namespace {
23 23
24 // See http://developer.apple.com/library/mac/#technotes/tn1103/_index.html 24 // See http://developer.apple.com/library/mac/#technotes/tn1103/_index.html
25 25
26 // The caller is responsible for freeing |matching_services|. 26 // The caller is responsible for freeing |matching_services|.
27 bool FindEthernetInterfaces(io_iterator_t* matching_services) { 27 bool FindEthernetInterfaces(io_iterator_t* matching_services) {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 CFRelease(serial); 138 CFRelease(serial);
139 } 139 }
140 140
141 // On windows, this is set to the volume id. Since it's not scrambled before 141 // On windows, this is set to the volume id. Since it's not scrambled before
142 // being sent, just set it to 1. 142 // being sent, just set it to 1.
143 *more_data = 1; 143 *more_data = 1;
144 return true; 144 return true;
145 } 145 }
146 146
147 } // namespace rlz_lib 147 } // namespace rlz_lib
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698