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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/extensions/bookmark_app_helper.h" 10 #include "chrome/browser/extensions/bookmark_app_helper.h"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_sync_data.h" 12 #include "chrome/browser/extensions/extension_sync_data.h"
13 #include "chrome/browser/extensions/extension_sync_service.h" 13 #include "chrome/browser/extensions/extension_sync_service.h"
14 #include "chrome/browser/extensions/launch_util.h" 14 #include "chrome/browser/extensions/launch_util.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/sync/test/integration/apps_helper.h" 16 #include "chrome/browser/sync/test/integration/apps_helper.h"
17 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 17 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
18 #include "chrome/browser/sync/test/integration/sync_app_helper.h" 18 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
19 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 19 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
20 #include "chrome/browser/sync/test/integration/sync_test.h" 20 #include "chrome/browser/sync/test/integration/sync_test.h"
21 #include "components/sync/api/string_ordinal.h" 21 #include "components/sync/model/string_ordinal.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "content/public/test/test_utils.h" 23 #include "content/public/test/test_utils.h"
24 #include "extensions/browser/app_sorting.h" 24 #include "extensions/browser/app_sorting.h"
25 #include "extensions/browser/extension_prefs.h" 25 #include "extensions/browser/extension_prefs.h"
26 #include "extensions/browser/extension_registry.h" 26 #include "extensions/browser/extension_registry.h"
27 #include "extensions/browser/extension_system.h" 27 #include "extensions/browser/extension_system.h"
28 #include "extensions/common/constants.h" 28 #include "extensions/common/constants.h"
29 29
30 using apps_helper::AllProfilesHaveSameApps; 30 using apps_helper::AllProfilesHaveSameApps;
31 using apps_helper::CopyNTPOrdinals; 31 using apps_helper::CopyNTPOrdinals;
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 content::WindowedNotificationObserver windowed_observer( 402 content::WindowedNotificationObserver windowed_observer(
403 extensions::NOTIFICATION_CRX_INSTALLER_DONE, 403 extensions::NOTIFICATION_CRX_INSTALLER_DONE,
404 base::Bind(&AllProfilesHaveSameApps)); 404 base::Bind(&AllProfilesHaveSameApps));
405 windowed_observer.Wait(); 405 windowed_observer.Wait();
406 } 406 }
407 } 407 }
408 408
409 // TODO(akalin): Add tests exercising: 409 // TODO(akalin): Add tests exercising:
410 // - Offline installation/uninstallation behavior 410 // - Offline installation/uninstallation behavior
411 // - App-specific properties 411 // - App-specific properties
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698