diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 10:27:18 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 10:27:18 +0000 |
| commit | c7d58d6889f8c8c1a676593cae355326170522d0 (patch) | |
| tree | 1dd70fb826fb4015321d767dc4bfc26dc1a59a8a /chrome/browser/browser_process.h | |
| parent | 31c1959a53e1ae65660cf1284c46c8d944591c89 (diff) | |
| download | chromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.zip chromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.tar.gz chromium_src-c7d58d6889f8c8c1a676593cae355326170522d0.tar.bz2 | |
When clearing plugin data at shutdown, wait for it to finish.
Also, Add some browser tests for clearing plugin data and enable npapi_test_plugin on 64-bit Linux; apparently it's been fixed.
BUG=58235, 18337, 26625
TEST=PluginDataRemoverTest.*
Review URL: http://codereview.chromium.org/6308001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process.h')
| -rw-r--r-- | chrome/browser/browser_process.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h index 1f335c0..3b9ec5e 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -187,10 +187,21 @@ class BrowserProcess { virtual void SetIPCLoggingEnabled(bool enable) = 0; #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; + } + private: // User-data-dir based profiles. std::vector<std::wstring> user_data_dir_profiles_; + // Used for testing plugin data removal at shutdown. + std::string plugin_data_remover_mime_type_; + DISALLOW_COPY_AND_ASSIGN(BrowserProcess); }; |