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

webkit/fileapi/quota_file_util_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 "webkit/fileapi/quota_file_util.h"
 
 #include "base/file_path.h"
 #include "base/memory/scoped_callback_factory.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
+#include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
+#include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/local_file_system_file_util.h"
-#include "webkit/fileapi/file_system_test_helper.h"
 
 namespace fileapi {
 
 class QuotaFileUtilTest : public testing::Test {
  public:
   QuotaFileUtilTest()
       : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   }
 
   void SetUp() {
@@ skipping 372 matching lines @@
   context.reset(NewContext());
   context->set_allowed_bytes_growth(QuotaFileUtil::kNoLimit);
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             QuotaFileUtil::GetInstance()->Delete(context.get(),
                                                  Path(dir),
                                                  true));
   ASSERT_EQ(0, GetCachedUsage());
 }
 
 }  // namespace fileapi