chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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

« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm ('k') | chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc » ('j') | no next file with comments »

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/memory/scoped_nsobject.h"	5 #include "base/memory/scoped_nsobject.h"

6 #include "base/sys_string_conversions.h"	6 #include "base/sys_string_conversions.h"

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

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

	9 #include "chrome/browser/instant/search.h"

9 #include "chrome/browser/sync/glue/session_model_associator.h"	10 #include "chrome/browser/sync/glue/session_model_associator.h"

10 #include "chrome/browser/sync/profile_sync_service_factory.h"	11 #include "chrome/browser/sync/profile_sync_service_factory.h"

11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"	12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

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

13 #include "chrome/browser/ui/cocoa/run_loop_testing.h"	14 #include "chrome/browser/ui/cocoa/run_loop_testing.h"

14 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"	15 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"

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

16 #include "chrome/browser/ui/search/search.h"

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

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

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

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

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

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

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

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

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

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

(...skipping 163 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190	190

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

192 // it's observing.	192 // it's observing.

193 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {	193 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {

194 chrome::search::EnableInstantExtendedAPIForTesting();	194 chrome::search::EnableInstantExtendedAPIForTesting();

195 [controller_ menuNeedsUpdate:[controller_ menu]];	195 [controller_ menuNeedsUpdate:[controller_ menu]];

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

197 }	197 }

198	198

199 } // namespace	199 } // namespace

OLD	NEW