Move models from app to ui/base/models

BUG=none
TEST=none
TBR=brettw


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/plugin_exceptions_table_model_unittest.cc b/chrome/browser/plugin_exceptions_table_model_unittest.cc
index 6e5a19c..18bd3bc 100644
--- a/chrome/browser/plugin_exceptions_table_model_unittest.cc
+++ b/chrome/browser/plugin_exceptions_table_model_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/table_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ -12,6 +11,7 @@
 #include "chrome/test/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/models/table_model_observer.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
@@ -22,9 +22,9 @@ namespace plugin_test_internal {
 using ::testing::_;
 using ::testing::Invoke;
 
-class MockTableModelObserver : public TableModelObserver {
+class MockTableModelObserver : public ui::TableModelObserver {
  public:
-  explicit MockTableModelObserver(TableModel* model)
+   explicit MockTableModelObserver(ui::TableModel* model)
       : model_(model) {
     ON_CALL(*this, OnItemsRemoved(_, _))
         .WillByDefault(
@@ -45,7 +45,7 @@ class MockTableModelObserver : public TableModelObserver {
     EXPECT_LT(start, model_->RowCount() + 1);
   }
 
-  TableModel* model_;
+  ui::TableModel* model_;
 };
 
 }  // namespace plugin_test_internal
@@ -111,7 +111,7 @@ class PluginExceptionsTableModelTest : public testing::Test {
     Entries& settings = table_model_->settings_;
     std::deque<int>& row_counts = table_model_->row_counts_;
     std::deque<std::string>& resources = table_model_->resources_;
-    TableModel::Groups& groups = table_model_->groups_;
+    ui::TableModel::Groups& groups = table_model_->groups_;
 
     EXPECT_EQ(groups.size(), row_counts.size());
     EXPECT_EQ(groups.size(), resources.size());