commit 868fa2fe829687343ffae624259930155e16dbd8
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
tree 54d316199dd9739c57c3aacd131853bbd6554a94
parent bb1bdbd796f966b5bf11f40ecbea12621c7bfac9

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

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 0d26d1d..12b3214 100644
--- a/rlz/mac/lib/machine_id_mac.cc
+++ b/rlz/mac/lib/machine_id_mac.cc
@@ -12,10 +12,10 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
-#include "base/string16.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace rlz_lib {