diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 00:37:52 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-06 00:37:52 +0000 |
| commit | bb05cae18dede8470d74aaa36c0b3ca1736a3159 (patch) | |
| tree | bb5c3cbd24733b5c310fbb5fe73de7a55c8ab9e5 /chrome/browser/chromeos/gview_request_interceptor_unittest.cc | |
| parent | 5c187863e3b264fb954d37fe24e41cf5b4c29c5b (diff) | |
| download | chromium_src-bb05cae18dede8470d74aaa36c0b3ca1736a3159.zip chromium_src-bb05cae18dede8470d74aaa36c0b3ca1736a3159.tar.gz chromium_src-bb05cae18dede8470d74aaa36c0b3ca1736a3159.tar.bz2 | |
Cleanup: Constify some ProfileKeyedBaseFactory methods and all overrides. Remove ProfileKeyedBaseFactory::ForceRegisterPrefsForTest()
Review URL: https://chromiumcodereview.appspot.com/10908088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/gview_request_interceptor_unittest.cc')
| -rw-r--r-- | chrome/browser/chromeos/gview_request_interceptor_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index d137f57..7f7299b 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -13,6 +13,7 @@ #include "chrome/browser/plugin_prefs_factory.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_pref_service.h" +#include "chrome/test/base/testing_profile.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/resource_request_info.h" #include "content/public/test/mock_resource_context.h" @@ -107,9 +108,8 @@ class GViewRequestInterceptorTest : public testing::Test { job_factory_.SetProtocolHandler("http", new GViewRequestProtocolFactory); job_factory_.AddInterceptor(new GViewRequestInterceptor); request_context->set_job_factory(&job_factory_); - PluginPrefsFactory::GetInstance()->ForceRegisterPrefsForTest(&prefs_); - plugin_prefs_ = new PluginPrefs(); - plugin_prefs_->SetPrefs(&prefs_); + plugin_prefs_ = PluginPrefs::GetForTestingProfile(&profile_); + PluginPrefsFactory::GetInstance()->RegisterUserPrefsOnProfile(&profile_); ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance(); filter->RegisterResourceContext(plugin_prefs_, &resource_context_); @@ -179,7 +179,7 @@ class GViewRequestInterceptorTest : public testing::Test { content::TestBrowserThread file_thread_; content::TestBrowserThread io_thread_; webkit::npapi::MockPluginList plugin_list_; - TestingPrefService prefs_; + TestingProfile profile_; scoped_refptr<PluginPrefs> plugin_prefs_; net::URLRequestJobFactoryImpl job_factory_; const net::URLRequestJobFactory* old_factory_; |