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

chrome/browser/search_engines/template_url_prepopulate_data_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 "base/file_util.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
+#include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
-#include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef testing::Test TemplateURLPrepopulateDataTest;
 
 const int kCountryIds[] = {
     'A'<<8|'D', 'A'<<8|'E', 'A'<<8|'F', 'A'<<8|'G', 'A'<<8|'I',
@@ skipping 154 matching lines @@
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(bad_engine));
   GURL engine_with_logo("http://www.ask.com/");
   EXPECT_EQ(IDR_SEARCH_ENGINE_LOGO_ASK,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_with_logo));
   GURL engine_no_logo("http://araby.com/");
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_no_logo));
 
 }