Move scoped_temp_dir and scoped_native_library back from base/memory to base.

chrome/browser/safe_browsing/prefix_set_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/prefix_set.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/rand_util.h"
+#include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 class PrefixSetTest : public PlatformTest {
  protected:
   // Constants for the v1 format.
   static const size_t kMagicOffset = 0 * sizeof(uint32);
   static const size_t kVersionOffset = 1 * sizeof(uint32);
@@ skipping 422 matching lines @@
     if (delta > 0xFFFF) {
       EXPECT_FALSE(prefix_set.IsDeltaAt(i));
     } else {
       ASSERT_TRUE(prefix_set.IsDeltaAt(i));
       EXPECT_EQ(delta, prefix_set.DeltaAt(i));
     }
   }
 }
 
 }  // namespace