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

Side by Side Diff: chrome/browser/extensions/api/music_manager_private/device_id_linux.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/extensions/api/music_manager_private/device_id.h" 5 #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
6 6
7 #include <sys/socket.h> // Must be included before ifaddrs.h. 7 #include <sys/socket.h> // Must be included before ifaddrs.h.
8 #include <ifaddrs.h> 8 #include <ifaddrs.h>
9 #include <net/if.h> 9 #include <net/if.h>
10 #include <sys/ioctl.h> 10 #include <sys/ioctl.h>
11 11
12 #include <map> 12 #include <map>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/file_util.h"
16 #include "base/files/file_enumerator.h" 15 #include "base/files/file_enumerator.h"
17 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/files/file_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/threading/thread_restrictions.h" 20 #include "base/threading/thread_restrictions.h"
21 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 22
23 namespace { 23 namespace {
24 24
25 using extensions::api::DeviceId; 25 using extensions::api::DeviceId;
26 26
27 typedef base::Callback<bool(const void* bytes, size_t size)> 27 typedef base::Callback<bool(const void* bytes, size_t size)>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 content::BrowserThread::PostTask( 197 content::BrowserThread::PostTask(
198 content::BrowserThread::FILE, 198 content::BrowserThread::FILE,
199 FROM_HERE, 199 FROM_HERE,
200 base::Bind(GetRawDeviceIdImpl, 200 base::Bind(GetRawDeviceIdImpl,
201 base::Bind(DeviceId::IsValidMacAddress), 201 base::Bind(DeviceId::IsValidMacAddress),
202 callback)); 202 callback));
203 } 203 }
204 204
205 } // namespace api 205 } // namespace api
206 } // namespace extensions 206 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698