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

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

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor CR feedback addressed. Created 6 years, 2 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
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/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"
11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" 10 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
12 #include "chrome/browser/sync/profile_sync_service_factory.h" 11 #include "chrome/browser/sync/profile_sync_service_factory.h"
13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
15 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 14 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 15 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 16 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 17 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
19 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" 18 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"
20 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 19 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 232 }
234 233
235 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model 234 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model
236 // it's observing. 235 // it's observing.
237 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) { 236 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {
238 [controller_ menuNeedsUpdate:[controller_ menu]]; 237 [controller_ menuNeedsUpdate:[controller_ menu]];
239 // If the delete order is wrong then the test will crash on exit. 238 // If the delete order is wrong then the test will crash on exit.
240 } 239 }
241 240
242 } // namespace 241 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698