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

chrome/browser/extensions/extension_updater.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_BROWSER_EXTENSIONS_EXTENSION_UPDATER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_UPDATER_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_temp_dir.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 
 class Extension;
 class ExtensionPrefs;
@@ skipping 325 matching lines @@
   // The ids of extensions that have in-progress update checks.
   std::set<std::string> in_progress_ids_;
 
   FRIEND_TEST(ExtensionUpdaterTest, TestStartUpdateCheckMemory);
   FRIEND_TEST(ExtensionUpdaterTest, TestAfterStopBehavior);
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUpdater);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_UPDATER_H_