Move more files from chrome/test to chrome/test/base, part #5

chrome/browser/content_settings/content_settings_pref_provider_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 "chrome/browser/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/default_pref_store.h"
 #include "chrome/browser/prefs/incognito_user_pref_store.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/testing_browser_process_test.h"
-#include "chrome/test/testing_pref_service.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace content_settings {
 
 class PrefDefaultProviderTest : public TestingBrowserProcessTest {
  public:
@@ skipping 450 matching lines @@
   ASSERT_TRUE(NULL != settings) << "Dictionary has no key: "
                                 << primary_pattern.ToString();
   ASSERT_EQ(1U, settings->size());
   settings->GetInteger("javascript", &setting_value);
   EXPECT_EQ(setting_value, CONTENT_SETTING_ALLOW);
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings