Merge PluginGroups for Adobe Reader

chrome/browser/plugin_exceptions_table_model_unittest.cc

Index: chrome/browser/plugin_exceptions_table_model_unittest.cc
diff --git a/chrome/browser/plugin_exceptions_table_model_unittest.cc b/chrome/browser/plugin_exceptions_table_model_unittest.cc
index 9540893b1e4248853922eac82b2d2b3eefd61e1e..b96f3fb10e279793e252065ef7420d4f0d934d49 100644
--- a/chrome/browser/plugin_exceptions_table_model_unittest.cc
+++ b/chrome/browser/plugin_exceptions_table_model_unittest.cc
@@ -21,7 +21,6 @@
 namespace plugin_test_internal {
 
 using ::testing::_;
-using ::testing::InSequence;
 using ::testing::Invoke;
 
 class MockTableModelObserver : public TableModelObserver {
@@ -50,6 +49,10 @@ class MockTableModelObserver : public TableModelObserver {
   TableModel* model_;
 };
 
+}  // namespace plugin_test_internal
+
+using ::testing::InSequence;
+
 class PluginExceptionsTableModelTest : public testing::Test {
  public:
   PluginExceptionsTableModelTest()
@@ -154,7 +157,7 @@ TEST_F(PluginExceptionsTableModelTest, Basic) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveOneRow) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnItemsRemoved(1, 1));
@@ -168,7 +171,7 @@ TEST_F(PluginExceptionsTableModelTest, RemoveOneRow) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveLastRowInGroup) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnModelChanged());
@@ -202,7 +205,7 @@ TEST_F(PluginExceptionsTableModelTest, RemoveLastRowInGroup) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveAllRows) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnModelChanged());
@@ -212,5 +215,3 @@ TEST_F(PluginExceptionsTableModelTest, RemoveAllRows) {
   CheckInvariants();
   table_model_->SetObserver(NULL);
 }
-
-}  // namespace plugin_test_internal