| 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/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.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/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 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 15 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" |
| 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 17 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 17 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 19 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" | 19 #import "chrome/browser/ui/cocoa/view_resizer_pong.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/app_menu_model.h" |
| 22 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" | 22 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" |
| 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_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/browser_sync/browser/profile_sync_service.h" | 27 #include "components/browser_sync/browser/profile_sync_service.h" |
| 28 #include "components/sync/api/fake_sync_change_processor.h" |
| 29 #include "components/sync/api/sync_error_factory_mock.h" |
| 28 #include "components/sync_driver/local_device_info_provider_mock.h" | 30 #include "components/sync_driver/local_device_info_provider_mock.h" |
| 29 #include "components/sync_driver/sync_client.h" | 31 #include "components/sync_driver/sync_client.h" |
| 30 #include "components/sync_driver/sync_prefs.h" | 32 #include "components/sync_driver/sync_prefs.h" |
| 31 #include "components/sync_sessions/fake_sync_sessions_client.h" | 33 #include "components/sync_sessions/fake_sync_sessions_client.h" |
| 32 #include "components/sync_sessions/sessions_sync_manager.h" | 34 #include "components/sync_sessions/sessions_sync_manager.h" |
| 33 #include "grit/theme_resources.h" | 35 #include "grit/theme_resources.h" |
| 34 #include "sync/api/fake_sync_change_processor.h" | |
| 35 #include "sync/api/sync_error_factory_mock.h" | |
| 36 #include "testing/gmock/include/gmock/gmock.h" | 36 #include "testing/gmock/include/gmock/gmock.h" |
| 37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
| 38 #include "testing/gtest_mac.h" | 38 #include "testing/gtest_mac.h" |
| 39 #include "testing/platform_test.h" | 39 #include "testing/platform_test.h" |
| 40 #include "ui/base/l10n/l10n_util.h" | 40 #include "ui/base/l10n/l10n_util.h" |
| 41 #include "ui/base/resource/resource_bundle.h" | 41 #include "ui/base/resource/resource_bundle.h" |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| 44 | 44 |
| 45 class MockAppMenuModel : public AppMenuModel { | 45 class MockAppMenuModel : public AppMenuModel { |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 BrowserRemovedObserver observer; | 263 BrowserRemovedObserver observer; |
| 264 // This is normally called by ToolbarController, but since |controller_| is | 264 // This is normally called by ToolbarController, but since |controller_| is |
| 265 // not owned by one, call it here. | 265 // not owned by one, call it here. |
| 266 [controller_ browserWillBeDestroyed]; | 266 [controller_ browserWillBeDestroyed]; |
| 267 CloseBrowserWindow(); | 267 CloseBrowserWindow(); |
| 268 observer.WaitUntilBrowserRemoved(); | 268 observer.WaitUntilBrowserRemoved(); |
| 269 // |controller_| is released in TearDown(). | 269 // |controller_| is released in TearDown(). |
| 270 } | 270 } |
| 271 | 271 |
| 272 } // namespace | 272 } // namespace |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2148293004:
[Sync] //components/sync external changes [DO NOT SUBMIT] (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1