chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

OLD	NEW
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/strings/sys_string_conversions.h"	7 #include "base/strings/sys_string_conversions.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/sync/glue/device_info.h"	10 #include "chrome/browser/sync/glue/device_info.h"

11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"	11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"

12 #include "chrome/browser/sync/profile_sync_service_factory.h"	12 #include "chrome/browser/sync/profile_sync_service_factory.h"

13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"	13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"

14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"	14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

15 #include "chrome/browser/ui/cocoa/run_loop_testing.h"	15 #include "chrome/browser/ui/cocoa/run_loop_testing.h"

16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"	17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"

18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"	18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

19 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"	19 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"

20 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"	20 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"

21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"	21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

22 #include "chrome/common/chrome_switches.h"	22 #include "chrome/common/chrome_switches.h"

	23 #include "chrome/grit/generated_resources.h"

23 #include "chrome/test/base/testing_profile.h"	24 #include "chrome/test/base/testing_profile.h"

24 #include "grit/generated_resources.h"

25 #include "grit/theme_resources.h"	25 #include "grit/theme_resources.h"

26 #include "sync/api/fake_sync_change_processor.h"	26 #include "sync/api/fake_sync_change_processor.h"

27 #include "sync/api/sync_error_factory_mock.h"	27 #include "sync/api/sync_error_factory_mock.h"

28 #include "testing/gmock/include/gmock/gmock.h"	28 #include "testing/gmock/include/gmock/gmock.h"

29 #include "testing/gtest/include/gtest/gtest.h"	29 #include "testing/gtest/include/gtest/gtest.h"

30 #include "testing/gtest_mac.h"	30 #include "testing/gtest_mac.h"

31 #include "testing/platform_test.h"	31 #include "testing/platform_test.h"

32 #include "ui/base/l10n/l10n_util.h"	32 #include "ui/base/l10n/l10n_util.h"

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

34	34

(...skipping 198 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
233 }	233 }

234	234

235 // Verify that \|RecentTabsMenuModelDelegate\| is deleted before the model	235 // Verify that \|RecentTabsMenuModelDelegate\| is deleted before the model

236 // it's observing.	236 // it's observing.

237 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {	237 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {

238 [controller_ menuNeedsUpdate:[controller_ menu]];	238 [controller_ menuNeedsUpdate:[controller_ menu]];

239 // If the delete order is wrong then the test will crash on exit.	239 // If the delete order is wrong then the test will crash on exit.

240 }	240 }

241	241

242 } // namespace	242 } // namespace

OLD	NEW