Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/browser/plugin_exceptions_table_model_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/auto_reset.h" 5 #include "base/auto_reset.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/mock_plugin_exceptions_table_model.h" 8 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/testing_browser_process_test.h"
11 #include "chrome/test/base/testing_pref_service.h" 10 #include "chrome/test/base/testing_pref_service.h"
12 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
13 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/models/table_model_observer.h" 14 #include "ui/base/models/table_model_observer.h"
16 #include "webkit/plugins/npapi/plugin_group.h" 15 #include "webkit/plugins/npapi/plugin_group.h"
17 #include "webkit/plugins/webplugininfo.h" 16 #include "webkit/plugins/webplugininfo.h"
18 17
19 // Can't be an internal namespace because PluginExceptionsTableModel declares 18 // Can't be an internal namespace because PluginExceptionsTableModel declares
20 // as a friend. 19 // as a friend.
(...skipping 25 matching lines...) Expand all
46 EXPECT_LT(start, model_->RowCount() + 1); 45 EXPECT_LT(start, model_->RowCount() + 1);
47 } 46 }
48 47
49 ui::TableModel* model_; 48 ui::TableModel* model_;
50 }; 49 };
51 50
52 } // namespace plugin_test_internal 51 } // namespace plugin_test_internal
53 52
54 using ::testing::InSequence; 53 using ::testing::InSequence;
55 54
56 class PluginExceptionsTableModelTest : public TestingBrowserProcessTest { 55 class PluginExceptionsTableModelTest : public testing::Test {
57 public: 56 public:
58 PluginExceptionsTableModelTest() 57 PluginExceptionsTableModelTest()
59 : ui_thread_(BrowserThread::UI, &message_loop_), 58 : ui_thread_(BrowserThread::UI, &message_loop_),
60 command_line_(CommandLine::ForCurrentProcess(), 59 command_line_(CommandLine::ForCurrentProcess(),
61 *CommandLine::ForCurrentProcess()) {} 60 *CommandLine::ForCurrentProcess()) {}
62 61
63 virtual void SetUp() { 62 virtual void SetUp() {
64 CommandLine::ForCurrentProcess()->AppendSwitch( 63 CommandLine::ForCurrentProcess()->AppendSwitch(
65 switches::kEnableResourceContentSettings); 64 switches::kEnableResourceContentSettings);
66 65
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 plugin_test_internal::MockTableModelObserver observer(table_model_.get()); 215 plugin_test_internal::MockTableModelObserver observer(table_model_.get());
217 table_model_->SetObserver(&observer); 216 table_model_->SetObserver(&observer);
218 217
219 EXPECT_CALL(observer, OnModelChanged()); 218 EXPECT_CALL(observer, OnModelChanged());
220 table_model_->RemoveAll(); 219 table_model_->RemoveAll();
221 EXPECT_EQ(0, table_model_->RowCount()); 220 EXPECT_EQ(0, table_model_->RowCount());
222 EXPECT_EQ(0, static_cast<int>(table_model_->GetGroups().size())); 221 EXPECT_EQ(0, static_cast<int>(table_model_->GetGroups().size()));
223 CheckInvariants(); 222 CheckInvariants();
224 table_model_->SetObserver(NULL); 223 table_model_->SetObserver(NULL);
225 } 224 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698