| 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 <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" |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 // Create an invalid launch type and ensure it doesn't get down-synced. This | 361 // Create an invalid launch type and ensure it doesn't get down-synced. This |
| 362 // simulates the case of a future launch type being added which old versions | 362 // simulates the case of a future launch type being added which old versions |
| 363 // don't yet understand. | 363 // don't yet understand. |
| 364 extensions::ExtensionSyncData invalid_launch_type_data( | 364 extensions::ExtensionSyncData invalid_launch_type_data( |
| 365 *extension, | 365 *extension, |
| 366 original_data.enabled(), | 366 original_data.enabled(), |
| 367 original_data.disable_reasons(), | 367 original_data.disable_reasons(), |
| 368 original_data.incognito_enabled(), | 368 original_data.incognito_enabled(), |
| 369 original_data.remote_install(), | 369 original_data.remote_install(), |
| 370 original_data.all_urls_enabled(), | 370 original_data.all_urls_enabled(), |
| 371 original_data.installed_by_custodian(), |
| 371 original_data.app_launch_ordinal(), | 372 original_data.app_launch_ordinal(), |
| 372 original_data.page_ordinal(), | 373 original_data.page_ordinal(), |
| 373 extensions::NUM_LAUNCH_TYPES); | 374 extensions::NUM_LAUNCH_TYPES); |
| 374 extension_sync_service->ApplySyncData(invalid_launch_type_data); | 375 extension_sync_service->ApplySyncData(invalid_launch_type_data); |
| 375 | 376 |
| 376 // The launch type should remain the same. | 377 // The launch type should remain the same. |
| 377 ASSERT_TRUE(AwaitAllProfilesHaveSameApps()); | 378 ASSERT_TRUE(AwaitAllProfilesHaveSameApps()); |
| 378 } | 379 } |
| 379 | 380 |
| 380 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, BookmarkApp) { | 381 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, BookmarkApp) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 404 content::WindowedNotificationObserver windowed_observer( | 405 content::WindowedNotificationObserver windowed_observer( |
| 405 extensions::NOTIFICATION_CRX_INSTALLER_DONE, | 406 extensions::NOTIFICATION_CRX_INSTALLER_DONE, |
| 406 base::Bind(&AllProfilesHaveSameApps)); | 407 base::Bind(&AllProfilesHaveSameApps)); |
| 407 windowed_observer.Wait(); | 408 windowed_observer.Wait(); |
| 408 } | 409 } |
| 409 } | 410 } |
| 410 | 411 |
| 411 // TODO(akalin): Add tests exercising: | 412 // TODO(akalin): Add tests exercising: |
| 412 // - Offline installation/uninstallation behavior | 413 // - Offline installation/uninstallation behavior |
| 413 // - App-specific properties | 414 // - App-specific properties |
| OLD | NEW |