[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/shill_event.h b/shill_event.h
index 9ae4304..cc2bdb1 100644
--- a/shill_event.h
+++ b/shill_event.h
@@ -8,10 +8,10 @@
 #include <vector>
 
 #include <base/basictypes.h>
-#include <base/callback.h>
+#include <base/callback_old.h>
+#include <base/memory/ref_counted.h>
+#include <base/memory/scoped_ptr.h>
 #include <base/message_loop.h>
-#include <base/ref_counted.h>
-#include <base/scoped_ptr.h>
 
 namespace base {
 class MessageLoopProxy;