commit c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d
author Torne (Richard Coles) <torne@google.com> Thu May 09 18:35:53 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon May 13 13:57:14 2013 +0100
tree 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a
parent 2d519ce2457219605d4f472da8d2ffd469796035

Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f

rlz/mac/lib/machine_id_mac.cc

diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc
index fb9a34c..0d26d1d 100644
--- a/rlz/mac/lib/machine_id_mac.cc
+++ b/rlz/mac/lib/machine_id_mac.cc
@@ -4,9 +4,9 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
+#include <IOKit/network/IOEthernetController.h>
 #include <IOKit/network/IOEthernetInterface.h>
 #include <IOKit/network/IONetworkInterface.h>
-#include <IOKit/network/IOEthernetController.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ -14,7 +14,7 @@
 #include "base/mac/scoped_ioobject.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
-#include "base/sys_string_conversions.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 
 namespace rlz_lib {