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

chrome/test/testing_profile.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_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
+#include "base/scoped_temp_dir.h"
 #include "base/timer.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace content {
 class ResourceContextGetter;
 }
 
 namespace history {
 class TopSites;
 }
@@ skipping 384 matching lines @@
   explicit DerivedTestingProfile(Profile* profile);
   virtual ~DerivedTestingProfile();
 
   virtual ProfileId GetRuntimeId();
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_