[verity] Roll forward to new libchrome

Chrome still has base/scoped_ptr.h, but it's just a pointer to base/memory/scoped_ptr.h
Update the includes here to be more future-compatible.

BUG=chromium-os:14304
TEST=emerge with tests

Change-Id: I08cec15f8512a84dad204a90ab0bdeaf5c297e59
Reviewed-on: http://gerrit.chromium.org/gerrit/929
Reviewed-by: Will Drewry <wad@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/dm-bht_unittest.cc b/dm-bht_unittest.cc
index d7cf61a..396b446 100644
--- a/dm-bht_unittest.cc
+++ b/dm-bht_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010 The Chromium OS Authors. All rights reserved.
+// Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by the GPL v2 license that can
 // be found in the LICENSE file.
 //
@@ -6,7 +6,7 @@
 
 #include <base/basictypes.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <gtest/gtest.h>
 #include <stdlib.h>
 
diff --git a/file_hasher_unittest.cc b/file_hasher_unittest.cc
index 7b8b633..3dff901 100644
--- a/file_hasher_unittest.cc
+++ b/file_hasher_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by the GPL v2 license that can
 // be found in the LICENSE file.
 //
@@ -6,7 +6,7 @@
 #include "verity/file_hasher.h"
 
 #include <base/basictypes.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>