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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. Created 7 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/prefs/browser_prefs.h"
8 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
9 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/global_error/global_error.h" 11 #include "chrome/browser/ui/global_error/global_error.h"
11 #include "chrome/browser/ui/global_error/global_error_service.h" 12 #include "chrome/browser/ui/global_error/global_error_service.h"
12 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 13 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/test/base/browser_with_test_window_test.h" 15 #include "chrome/test/base/browser_with_test_window_test.h"
15 #include "chrome/test/base/menu_model_test.h" 16 #include "chrome/test/base/menu_model_test.h"
17 #include "chrome/test/base/testing_browser_process.h"
18 #include "chrome/test/base/testing_io_thread_state.h"
19 #include "chrome/test/base/testing_pref_service_syncable.h"
16 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
17 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
18 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
19 23
20 namespace { 24 namespace {
21 25
22 // Error class has a menu item. 26 // Error class has a menu item.
23 class MenuError : public GlobalError { 27 class MenuError : public GlobalError {
24 public: 28 public:
25 explicit MenuError(int command_id) 29 explicit MenuError(int command_id)
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 74
71 } // namespace 75 } // namespace
72 76
73 class WrenchMenuModelTest : public BrowserWithTestWindowTest, 77 class WrenchMenuModelTest : public BrowserWithTestWindowTest,
74 public ui::AcceleratorProvider { 78 public ui::AcceleratorProvider {
75 public: 79 public:
76 // Don't handle accelerators. 80 // Don't handle accelerators.
77 virtual bool GetAcceleratorForCommandId( 81 virtual bool GetAcceleratorForCommandId(
78 int command_id, 82 int command_id,
79 ui::Accelerator* accelerator) OVERRIDE { return false; } 83 ui::Accelerator* accelerator) OVERRIDE { return false; }
84
85 protected:
86 virtual void SetUp() OVERRIDE {
87 prefs_.reset(new TestingPrefServiceSimple());
88 chrome::RegisterLocalState(prefs_->registry());
89
90 TestingBrowserProcess::GetGlobal()->SetLocalState(prefs_.get());
91 testing_io_thread_state_.reset(new chrome::TestingIOThreadState());
92 BrowserWithTestWindowTest::SetUp();
93 }
94
95 virtual void TearDown() OVERRIDE {
96 BrowserWithTestWindowTest::TearDown();
97 testing_io_thread_state_.reset();
98 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
99 DestroyBrowserAndProfile();
100 }
101
102 private:
103 scoped_ptr<TestingPrefServiceSimple> prefs_;
104 scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
80 }; 105 };
81 106
82 // Copies parts of MenuModelTest::Delegate and combines them with the 107 // Copies parts of MenuModelTest::Delegate and combines them with the
83 // WrenchMenuModel since WrenchMenuModel is now a SimpleMenuModel::Delegate and 108 // WrenchMenuModel since WrenchMenuModel is now a SimpleMenuModel::Delegate and
84 // not derived from SimpleMenuModel. 109 // not derived from SimpleMenuModel.
85 class TestWrenchMenuModel : public WrenchMenuModel { 110 class TestWrenchMenuModel : public WrenchMenuModel {
86 public: 111 public:
87 TestWrenchMenuModel(ui::AcceleratorProvider* provider, 112 TestWrenchMenuModel(ui::AcceleratorProvider* provider,
88 Browser* browser) 113 Browser* browser)
89 : WrenchMenuModel(provider, browser, false), 114 : WrenchMenuModel(provider, browser, false),
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 217
193 class EncodingMenuModelTest : public BrowserWithTestWindowTest, 218 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
194 public MenuModelTest { 219 public MenuModelTest {
195 }; 220 };
196 221
197 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { 222 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
198 EncodingMenuModel model(browser()); 223 EncodingMenuModel model(browser());
199 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents()); 224 ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
200 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); 225 EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
201 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698