Commit 52172024 authored by tony@chromium.org's avatar tony@chromium.org

Remove string from BrowserProcess interface.

It's an interface and shouldn't have any member variables.  Also, it's
not used anymore.

TEST=PluginDataRemoverTest browser tests


Review URL: http://codereview.chromium.org/7664018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97110 0039d316-1c4b-4281-b951-d872f2087c98
parent fc24dc42
...@@ -231,14 +231,6 @@ class BrowserProcess { ...@@ -231,14 +231,6 @@ class BrowserProcess {
virtual void SetIPCLoggingEnabled(bool enable) = 0; virtual void SetIPCLoggingEnabled(bool enable) = 0;
#endif #endif
const std::string& plugin_data_remover_mime_type() const {
return plugin_data_remover_mime_type_;
}
void set_plugin_data_remover_mime_type(const std::string& mime_type) {
plugin_data_remover_mime_type_ = mime_type;
}
virtual MHTMLGenerationManager* mhtml_generation_manager() = 0; virtual MHTMLGenerationManager* mhtml_generation_manager() = 0;
virtual GpuBlacklistUpdater* gpu_blacklist_updater() = 0; virtual GpuBlacklistUpdater* gpu_blacklist_updater() = 0;
...@@ -246,9 +238,6 @@ class BrowserProcess { ...@@ -246,9 +238,6 @@ class BrowserProcess {
virtual ComponentUpdateService* component_updater() = 0; virtual ComponentUpdateService* component_updater() = 0;
private: private:
// Used for testing plugin data removal at shutdown.
std::string plugin_data_remover_mime_type_;
DISALLOW_COPY_AND_ASSIGN(BrowserProcess); DISALLOW_COPY_AND_ASSIGN(BrowserProcess);
}; };
......
...@@ -26,18 +26,6 @@ class PluginDataRemoverTest : public InProcessBrowserTest, ...@@ -26,18 +26,6 @@ class PluginDataRemoverTest : public InProcessBrowserTest,
public: public:
PluginDataRemoverTest() : InProcessBrowserTest() { } PluginDataRemoverTest() : InProcessBrowserTest() { }
virtual void SetUpOnMainThread() {
old_plugin_data_remover_mime_type_ =
g_browser_process->plugin_data_remover_mime_type();
g_browser_process->set_plugin_data_remover_mime_type(
kNPAPITestPluginMimeType);
}
virtual void TearDownOnMainThread() {
g_browser_process->set_plugin_data_remover_mime_type(
old_plugin_data_remover_mime_type_);
}
virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event) { virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event) {
MessageLoop::current()->Quit(); MessageLoop::current()->Quit();
} }
...@@ -50,9 +38,6 @@ class PluginDataRemoverTest : public InProcessBrowserTest, ...@@ -50,9 +38,6 @@ class PluginDataRemoverTest : public InProcessBrowserTest,
browser_directory.AppendASCII("plugins")); browser_directory.AppendASCII("plugins"));
#endif #endif
} }
private:
std::string old_plugin_data_remover_mime_type_;
}; };
IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) { IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) {
...@@ -64,10 +49,3 @@ IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) { ...@@ -64,10 +49,3 @@ IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, RemoveData) {
watcher.StartWatching(event, this); watcher.StartWatching(event, this);
ui_test_utils::RunMessageLoop(); ui_test_utils::RunMessageLoop();
} }
IN_PROC_BROWSER_TEST_F(PluginDataRemoverTest, AtShutdown) {
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kClearSiteDataOnExit, true);
g_browser_process->local_state()->SetBoolean(
prefs::kClearPluginLSODataEnabled, true);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment