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

chrome/browser/parsers/metadata_parser_filebase_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 <map>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"  // TODO(brettw) remove when WideToASCII moves.
 #include "chrome/browser/parsers/metadata_parser_filebase.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class FileMetaDataParserTest : public testing::Test {
  protected:
   virtual void SetUp() {
@@ skipping 69 matching lines @@
 
     expectations.erase(key);
   }
 
   EXPECT_TRUE(iter->IsEnd());
   EXPECT_FALSE(iter->GetNext(&key, &value));
   EXPECT_TRUE(expectations.empty());
 }
 
 }  // namespace