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

chrome/browser/webdata/web_database_migration_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 <string>
 
 #include "app/sql/statement.h"
 #include "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/webdata/autofill_change.h"
@@ skipping 1397 matching lines @@
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("00000000-0000-0000-0000-000000000005", s2.ColumnString(0));
 
     ASSERT_TRUE(s2.Step());
     EXPECT_EQ("00000000-0000-0000-0000-000000000006", s2.ColumnString(0));
 
     // That should be it.
     ASSERT_FALSE(s2.Step());
   }
 }