summaryrefslogtreecommitdiffstats
path: root/rlz/mac
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-30 00:27:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-30 00:27:00 +0000
commit13ac535324e020859ea18654a2b9f614fdcd20dc (patch)
tree05eedd4a0d1bf68653fefba72b44e7eebd0b17f9 /rlz/mac
parent5dea782b6e81dcc09ece431b477291211ef765a3 (diff)
downloadchromium_src-13ac535324e020859ea18654a2b9f614fdcd20dc.zip
chromium_src-13ac535324e020859ea18654a2b9f614fdcd20dc.tar.gz
chromium_src-13ac535324e020859ea18654a2b9f614fdcd20dc.tar.bz2
Update the remaining references to sys_string_conversions.h to its new location.
BUG=196305 TBR=isherman@chromium.org,rsleevi@chromium.org,keybuk@chromium.org,fischman@chromium.org, thestig@chromium.org,alexeypa@chromium.org,rogerta@chromium.org,cpu@chromium.org, akalin@chromium.org,ben@chromium.org,tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/13322003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/mac')
-rw-r--r--rlz/mac/lib/machine_id_mac.cc4
-rw-r--r--rlz/mac/lib/rlz_value_store_mac.mm2
2 files changed, 3 insertions, 3 deletions
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 {
diff --git a/rlz/mac/lib/rlz_value_store_mac.mm b/rlz/mac/lib/rlz_value_store_mac.mm
index b174fee..158fd88 100644
--- a/rlz/mac/lib/rlz_value_store_mac.mm
+++ b/rlz/mac/lib/rlz_value_store_mac.mm
@@ -7,7 +7,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
-#include "base/sys_string_conversions.h"
+#include "base/strings/sys_string_conversions.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/recursive_cross_process_lock_posix.h"