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

chrome/test/automation/proxy_launcher.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/process.h"
+#include "base/scoped_temp_dir.h"
 #include "base/time.h"
 
 class AutomationProxy;
 
 // Base class for all ProxyLauncher implementations. Contains functionality
 // fo launching, terminating, and connecting tests to browser processes. This
 // class determines which AutomationProxy implementation is used by a test.
 // Command line arguments passed to the browser are set in this class.
 //
 // Subclass from this class to use a different AutomationProxy
@@ skipping 305 matching lines @@
 
  protected:
   std::string channel_id_;      // Channel id of automation proxy.
   bool disconnect_on_failure_;  // True if we disconnect on IPC channel failure.
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_