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

chrome/browser/profiles/profile_manager_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 <string>
 
 #include "base/command_line.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_browser_process_test.h"
@@ skipping 201 matching lines @@
       temp_dir_.path().Append(FILE_PATH_LITERAL("New Profile 2"));
 
   MockObserver mock_observer;
   EXPECT_CALL(mock_observer, OnProfileCreated(testing::NotNull())).Times(2);
 
   profile_manager_->CreateProfileAsync(dest_path1, &mock_observer);
   profile_manager_->CreateProfileAsync(dest_path2, &mock_observer);
 
   message_loop_.RunAllPending();
 }