diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 13:29:41 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 13:29:41 +0000 |
| commit | 79ce10352dd7f73f221a68e2e9b62bb8aa30887b (patch) | |
| tree | 6ad96840fc5a452c43af2c39f154caf86c66a963 /chrome/browser/plugin_exceptions_table_model.h | |
| parent | d6166ca658f5011183ff2402d4d675e673e4e315 (diff) | |
| download | chromium_src-79ce10352dd7f73f221a68e2e9b62bb8aa30887b.zip chromium_src-79ce10352dd7f73f221a68e2e9b62bb8aa30887b.tar.gz chromium_src-79ce10352dd7f73f221a68e2e9b62bb8aa30887b.tar.bz2 | |
Clean up PluginGroup and related code.
To avoid data races, do not pass pointers to PluginGroup around. Instead, create copies as plain objects.
BUG=61210
TEST=existing unit tests still work; TSan no longer reports the race (see bug)
Review URL: http://codereview.chromium.org/5516004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model.h')
| -rw-r--r-- | chrome/browser/plugin_exceptions_table_model.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h index 3a7c69a..6e8f00b 100644 --- a/chrome/browser/plugin_exceptions_table_model.h +++ b/chrome/browser/plugin_exceptions_table_model.h @@ -7,6 +7,8 @@ #pragma once #include <deque> +#include <string> +#include <vector> #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/remove_rows_table_model.h" @@ -49,7 +51,7 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel, protected: // Subclasses can override this method for testing. - virtual void GetPlugins(NPAPI::PluginList::PluginMap* plugins); + virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups); private: friend class plugin_test_internal::PluginExceptionsTableModelTest; |