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

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 
 #pragma once
 
+#include <list>
 #include <string>
-#include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #if defined(OS_MACOSX)
 #include "base/lazy_instance.h"
 #endif
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/tools/test_shell/layout_test_controller.h"
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
@@ skipping 393 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_