Cleanup: Constify some ProfileKeyedBaseFactory methods and all overrides. Remove ProfileKeyedBaseFa…

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/plugin_prefs.h"
 #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"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_job.h"
@@ skipping 69 matching lines @@
         io_thread_(BrowserThread::IO, &message_loop_),
         plugin_list_(NULL, 0) {}
 
   virtual void SetUp() {
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     old_factory_ = request_context->job_factory();
     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_);
     PluginService::GetInstance()->SetFilter(filter);
 
     ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
 
     PluginService::GetInstance()->SetPluginListForTesting(&plugin_list_);
     PluginService::GetInstance()->Init();
   }
@@ skipping 49 matching lines @@
                                                      -1);
   }
 
  protected:
   base::ShadowingAtExitManager at_exit_manager_;  // Deletes PluginService.
   MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_thread_;
   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_;
   TestDelegate test_delegate_;
   FilePath pdf_path_;
   content::MockResourceContext resource_context_;
 };
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptHtml) {
   net::URLRequest request(
@@ skipping 92 matching lines @@
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfBlob), request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos