diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 21:37:49 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 21:37:49 +0000 |
commit | cea5e4f176b0cbee7e1e2df373ebe48b850490c6 (patch) | |
tree | 951c2c0d553e15867efcf57a4ff5585e016c5dbe /chrome/browser/plugin_exceptions_table_model_unittest.cc | |
parent | c4826855b1d36a18117adffcf5d8f71c9c20dedf (diff) | |
download | chromium_src-cea5e4f176b0cbee7e1e2df373ebe48b850490c6.zip chromium_src-cea5e4f176b0cbee7e1e2df373ebe48b850490c6.tar.gz chromium_src-cea5e4f176b0cbee7e1e2df373ebe48b850490c6.tar.bz2 |
Fix gcc 4.2 warning in unit test.
As seen at http://build.chromium.org/buildbot/try-server/builders/mac/builds/45974/steps/compile/logs/stdio :
warning: 'PluginExceptionsTableModelTest' has a field 'PluginExceptionsTableModelTest::table_model_' whose type uses the anonymous namespace
The fix for that is to move the test into the anonymous namespace too, which breaks the friend declaration. So I need to work around that, too.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3345019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model_unittest.cc')
-rw-r--r-- | chrome/browser/plugin_exceptions_table_model_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model_unittest.cc b/chrome/browser/plugin_exceptions_table_model_unittest.cc index 09eac8a..7720287 100644 --- a/chrome/browser/plugin_exceptions_table_model_unittest.cc +++ b/chrome/browser/plugin_exceptions_table_model_unittest.cc @@ -14,7 +14,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/plugins/webplugininfo.h" -namespace { +// Can't be an internal namespace because PluginExceptionsTableModel declares +// as a friend. +namespace plugin_test_internal { class MockTableModelObserver : public TableModelObserver { public: @@ -44,8 +46,6 @@ class TestingPluginExceptionsTableModel : public PluginExceptionsTableModel { std::vector<WebPluginInfo> plugins_; }; -} - class PluginExceptionsTableModelTest : public testing::Test { public: PluginExceptionsTableModelTest() @@ -75,9 +75,7 @@ class PluginExceptionsTableModelTest : public testing::Test { "bar", CONTENT_SETTING_ALLOW); - table_model_.reset(new TestingPluginExceptionsTableModel( - map, - NULL)); + table_model_.reset(new TestingPluginExceptionsTableModel(map, NULL)); std::vector<WebPluginInfo> plugins; WebPluginInfo foo_plugin; @@ -188,3 +186,5 @@ TEST_F(PluginExceptionsTableModelTest, RemoveAllRows) { CheckInvariants(); table_model_->SetObserver(NULL); } + +} // namespace plugin_test_internal |