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

chrome/test/sync/engine/test_directory_setter_upper.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.
 //
 // A handy class that takes care of setting up and destroying a
 // syncable::Directory instance for unit tests that require one.
 //
 // The expected usage is to make this a component of your test fixture:
 //
 //   class AwesomenessTest : public testing::Test {
@@ skipping 17 matching lines @@
 //
 
 #ifndef CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
 #define CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncable {
 class DirectoryManager;
 class ScopedDirLookup;
 }  // namespace syncable
 
 namespace browser_sync {
@@ skipping 80 matching lines @@
   virtual void TearDown();
   MockDirectory* directory() { return directory_.get(); }
 
  private:
   scoped_ptr<MockDirectory> directory_;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_