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

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 1417423003: chrome: Rename WrenchMenuModel to AppMenuModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/mac/scoped_nsobject.h" 6 #include "base/mac/scoped_nsobject.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/sync/profile_sync_service_factory.h" 11 #include "chrome/browser/sync/profile_sync_service_factory.h"
12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/browser_list_observer.h" 14 #include "chrome/browser/ui/browser_list_observer.h"
15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
16 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 16 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
17 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 17 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
18 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 18 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
19 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 19 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
20 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h" 20 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
21 #include "chrome/browser/ui/toolbar/app_menu_model.h"
21 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" 22 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"
22 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
23 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
24 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
25 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
26 #include "chrome/test/base/testing_profile.h" 26 #include "chrome/test/base/testing_profile.h"
27 #include "components/sync_driver/local_device_info_provider_mock.h" 27 #include "components/sync_driver/local_device_info_provider_mock.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "sync/api/fake_sync_change_processor.h" 29 #include "sync/api/fake_sync_change_processor.h"
30 #include "sync/api/sync_error_factory_mock.h" 30 #include "sync/api/sync_error_factory_mock.h"
31 #include "testing/gmock/include/gmock/gmock.h" 31 #include "testing/gmock/include/gmock/gmock.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 #include "testing/gtest_mac.h" 33 #include "testing/gtest_mac.h"
34 #include "testing/platform_test.h" 34 #include "testing/platform_test.h"
35 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
37 37
38 namespace { 38 namespace {
39 39
40 class MockWrenchMenuModel : public WrenchMenuModel { 40 class MockAppMenuModel : public AppMenuModel {
41 public: 41 public:
42 MockWrenchMenuModel() : WrenchMenuModel() {} 42 MockAppMenuModel() : AppMenuModel() {}
43 ~MockWrenchMenuModel() {} 43 ~MockAppMenuModel() {}
44 MOCK_METHOD2(ExecuteCommand, void(int command_id, int event_flags)); 44 MOCK_METHOD2(ExecuteCommand, void(int command_id, int event_flags));
45 }; 45 };
46 46
47 class DummyRouter : public browser_sync::LocalSessionEventRouter { 47 class DummyRouter : public browser_sync::LocalSessionEventRouter {
48 public: 48 public:
49 ~DummyRouter() override {} 49 ~DummyRouter() override {}
50 void StartRoutingTo( 50 void StartRoutingTo(
51 browser_sync::LocalSessionEventHandler* handler) override {} 51 browser_sync::LocalSessionEventHandler* handler) override {}
52 void Stop() override {} 52 void Stop() override {}
53 }; 53 };
54 54
55 class WrenchMenuControllerTest 55 class WrenchMenuControllerTest
56 : public CocoaProfileTest { 56 : public CocoaProfileTest {
57 public: 57 public:
58 WrenchMenuControllerTest() 58 WrenchMenuControllerTest()
59 : local_device_(new sync_driver::LocalDeviceInfoProviderMock( 59 : local_device_(new sync_driver::LocalDeviceInfoProviderMock(
60 "WrenchMenuControllerTest", 60 "WrenchMenuControllerTest",
61 "Test Machine", 61 "Test Machine",
62 "Chromium 10k", 62 "Chromium 10k",
63 "Chrome 10k", 63 "Chrome 10k",
64 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, 64 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
65 "device_id")) { 65 "device_id")) {
66 } 66 }
67 67
68 void SetUp() override { 68 void SetUp() override {
69 CocoaProfileTest::SetUp(); 69 CocoaProfileTest::SetUp();
70 ASSERT_TRUE(browser()); 70 ASSERT_TRUE(browser());
71 71
72 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]); 72 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]);
73 fake_model_.reset(new MockWrenchMenuModel); 73 fake_model_.reset(new MockAppMenuModel);
74 74
75 manager_.reset(new browser_sync::SessionsSyncManager( 75 manager_.reset(new browser_sync::SessionsSyncManager(
76 profile(), 76 profile(),
77 local_device_.get(), 77 local_device_.get(),
78 scoped_ptr<browser_sync::LocalSessionEventRouter>( 78 scoped_ptr<browser_sync::LocalSessionEventRouter>(
79 new DummyRouter()), 79 new DummyRouter()),
80 scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>( 80 scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>(
81 new browser_sync::BrowserSyncedWindowDelegatesGetter()))); 81 new browser_sync::BrowserSyncedWindowDelegatesGetter())));
82 manager_->MergeDataAndStartSyncing( 82 manager_->MergeDataAndStartSyncing(
83 syncer::SESSIONS, 83 syncer::SESSIONS,
(...skipping 18 matching lines...) Expand all
102 manager_.reset(); 102 manager_.reset();
103 CocoaProfileTest::TearDown(); 103 CocoaProfileTest::TearDown();
104 } 104 }
105 105
106 WrenchMenuController* controller() { 106 WrenchMenuController* controller() {
107 return controller_.get(); 107 return controller_.get();
108 } 108 }
109 109
110 base::scoped_nsobject<WrenchMenuController> controller_; 110 base::scoped_nsobject<WrenchMenuController> controller_;
111 111
112 scoped_ptr<MockWrenchMenuModel> fake_model_; 112 scoped_ptr<MockAppMenuModel> fake_model_;
113 113
114 private: 114 private:
115 scoped_ptr<browser_sync::SessionsSyncManager> manager_; 115 scoped_ptr<browser_sync::SessionsSyncManager> manager_;
116 scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_; 116 scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
117 }; 117 };
118 118
119 TEST_F(WrenchMenuControllerTest, Initialized) { 119 TEST_F(WrenchMenuControllerTest, Initialized) {
120 EXPECT_TRUE([controller() menu]); 120 EXPECT_TRUE([controller() menu]);
121 EXPECT_GE([[controller() menu] numberOfItems], 5); 121 EXPECT_GE([[controller() menu] numberOfItems], 5);
122 } 122 }
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 BrowserRemovedObserver observer; 257 BrowserRemovedObserver observer;
258 // This is normally called by ToolbarController, but since |controller_| is 258 // This is normally called by ToolbarController, but since |controller_| is
259 // not owned by one, call it here. 259 // not owned by one, call it here.
260 [controller_ browserWillBeDestroyed]; 260 [controller_ browserWillBeDestroyed];
261 CloseBrowserWindow(); 261 CloseBrowserWindow();
262 observer.WaitUntilBrowserRemoved(); 262 observer.WaitUntilBrowserRemoved();
263 // |controller_| is released in TearDown(). 263 // |controller_| is released in TearDown().
264 } 264 }
265 265
266 } // namespace 266 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698