[entd] Roll forward to new libchrome

BUG=chromium-os:14304
TEST=build, unit tests

Change-Id: I8d65eb5922c7a2cd7c1e0020c5487930d4c4bc29
Reviewed-on: http://gerrit.chromium.org/gerrit/817
Reviewed-by: Robert Ginda <rginda@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/callback_server.cc b/callback_server.cc
index ac98b92..1a3c37c 100644
--- a/callback_server.cc
+++ b/callback_server.cc
@@ -4,7 +4,7 @@
 
 #include "entd/callback_server.h"
 
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 #include "entd/entd.h"
 
diff --git a/entd.h b/entd.h
index 19652c6..f98b0b3 100644
--- a/entd.h
+++ b/entd.h
@@ -11,7 +11,7 @@
 
 #include <base/basictypes.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <v8.h>
 
 #include "entd/js_object_wrapper.h"
diff --git a/pkcs11.cc b/pkcs11.cc
index 4ee4714..6d18b80 100644
--- a/pkcs11.cc
+++ b/pkcs11.cc
@@ -13,7 +13,7 @@
 #include <base/basictypes.h>
 #include <base/file_util.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <chromeos/utility.h>
 #include <curl/curl.h>
 #include <opencryptoki/pkcs11.h>
diff --git a/pkcs11.h b/pkcs11.h
index d15a582..230fb21 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include <base/basictypes.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <chromeos/utility.h>
 #include <v8.h>