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

chrome/browser/search_engines/template_url_model_test_util.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 "chrome/browser/search_engines/template_url_model_test_util.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/threading/thread.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/test/testing_profile.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 211 matching lines @@
   return profile_->GetTemplateURLModel();
 }
 
 TestingProfile* TemplateURLModelTestUtil::profile() const {
   return profile_.get();
 }
 
 void TemplateURLModelTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }