[shill] Roll forward to new libchrome
Basically just a bunch of header renames.
BUG=chromium-os:14304
TEST=emerge with FEATURES=test
Change-Id: I426d66048731ac17719ab7b1ede318f7a15f294b
Reviewed-on: http://gerrit.chromium.org/gerrit/883
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/device_info.h b/device_info.h
index d6f20af..3c1d0ca 100644
--- a/device_info.h
+++ b/device_info.h
@@ -5,9 +5,9 @@
#ifndef SHILL_DEVICE_INFO_
#define SHILL_DEVICE_INFO_
-#include <base/callback.h>
+#include <base/callback_old.h>
#include <base/hash_tables.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include "shill/shill_event.h"