| 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 "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 4342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4353 sync_pb::EntitySpecifics specifics; | 4353 sync_pb::EntitySpecifics specifics; |
| 4354 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app(); | 4354 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app(); |
| 4355 sync_pb::ExtensionSpecifics* extension_specifics = | 4355 sync_pb::ExtensionSpecifics* extension_specifics = |
| 4356 app_specifics->mutable_extension(); | 4356 app_specifics->mutable_extension(); |
| 4357 extension_specifics->set_id(good_crx); | 4357 extension_specifics->set_id(good_crx); |
| 4358 extension_specifics->set_version("1.0"); | 4358 extension_specifics->set_version("1.0"); |
| 4359 extension_specifics->set_enabled(true); | 4359 extension_specifics->set_enabled(true); |
| 4360 | 4360 |
| 4361 syncer::SyncData sync_data = | 4361 syncer::SyncData sync_data = |
| 4362 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4362 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4363 syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); | 4363 syncer::SyncChange sync_change(FROM_HERE, |
| 4364 syncer::SyncChange::ACTION_UPDATE, |
| 4365 sync_data); |
| 4364 syncer::SyncChangeList list(1); | 4366 syncer::SyncChangeList list(1); |
| 4365 list[0] = sync_change; | 4367 list[0] = sync_change; |
| 4366 | 4368 |
| 4367 service_->ProcessSyncChanges(FROM_HERE, list); | 4369 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4368 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); | 4370 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); |
| 4369 } | 4371 } |
| 4370 | 4372 |
| 4371 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { | 4373 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { |
| 4372 InitializeEmptyExtensionService(); | 4374 InitializeEmptyExtensionService(); |
| 4373 const Extension* app = | 4375 const Extension* app = |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4486 syncer::EXTENSIONS, syncer::SyncDataList(), | 4488 syncer::EXTENSIONS, syncer::SyncDataList(), |
| 4487 scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), | 4489 scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), |
| 4488 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); | 4490 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); |
| 4489 | 4491 |
| 4490 sync_pb::EntitySpecifics specifics; | 4492 sync_pb::EntitySpecifics specifics; |
| 4491 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); | 4493 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); |
| 4492 ext_specifics->set_id(good_crx); | 4494 ext_specifics->set_id(good_crx); |
| 4493 ext_specifics->set_version("1.0"); | 4495 ext_specifics->set_version("1.0"); |
| 4494 syncer::SyncData sync_data = | 4496 syncer::SyncData sync_data = |
| 4495 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4497 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4496 syncer::SyncChange sync_change(syncer::SyncChange::ACTION_DELETE, sync_data); | 4498 syncer::SyncChange sync_change(FROM_HERE, |
| 4499 syncer::SyncChange::ACTION_DELETE, |
| 4500 sync_data); |
| 4497 syncer::SyncChangeList list(1); | 4501 syncer::SyncChangeList list(1); |
| 4498 list[0] = sync_change; | 4502 list[0] = sync_change; |
| 4499 | 4503 |
| 4500 // Should do nothing. | 4504 // Should do nothing. |
| 4501 service_->ProcessSyncChanges(FROM_HERE, list); | 4505 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4502 EXPECT_FALSE(service_->GetExtensionById(good_crx, true)); | 4506 EXPECT_FALSE(service_->GetExtensionById(good_crx, true)); |
| 4503 | 4507 |
| 4504 // Install the extension. | 4508 // Install the extension. |
| 4505 FilePath extension_path = data_dir_.AppendASCII("good.crx"); | 4509 FilePath extension_path = data_dir_.AppendASCII("good.crx"); |
| 4506 InstallCRX(extension_path, INSTALL_NEW); | 4510 InstallCRX(extension_path, INSTALL_NEW); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 4528 sync_pb::ExtensionSpecifics* extension_specifics = | 4532 sync_pb::ExtensionSpecifics* extension_specifics = |
| 4529 app_specifics->mutable_extension(); | 4533 app_specifics->mutable_extension(); |
| 4530 extension_specifics->set_id(good_crx); | 4534 extension_specifics->set_id(good_crx); |
| 4531 extension_specifics->set_version( | 4535 extension_specifics->set_version( |
| 4532 service_->GetInstalledExtension(good_crx)->version()->GetString()); | 4536 service_->GetInstalledExtension(good_crx)->version()->GetString()); |
| 4533 | 4537 |
| 4534 { | 4538 { |
| 4535 extension_specifics->set_enabled(true); | 4539 extension_specifics->set_enabled(true); |
| 4536 syncer::SyncData sync_data = | 4540 syncer::SyncData sync_data = |
| 4537 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4541 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4538 syncer::SyncChange sync_change( | 4542 syncer::SyncChange sync_change(FROM_HERE, |
| 4539 syncer::SyncChange::ACTION_DELETE, sync_data); | 4543 syncer::SyncChange::ACTION_DELETE, |
| 4544 sync_data); |
| 4540 syncer::SyncChangeList list(1); | 4545 syncer::SyncChangeList list(1); |
| 4541 list[0] = sync_change; | 4546 list[0] = sync_change; |
| 4542 | 4547 |
| 4543 // Should do nothing | 4548 // Should do nothing |
| 4544 service_->ProcessSyncChanges(FROM_HERE, list); | 4549 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4545 EXPECT_TRUE(service_->GetExtensionById(good_crx, true)); | 4550 EXPECT_TRUE(service_->GetExtensionById(good_crx, true)); |
| 4546 } | 4551 } |
| 4547 | 4552 |
| 4548 { | 4553 { |
| 4549 extension_specifics->set_enabled(false); | 4554 extension_specifics->set_enabled(false); |
| 4550 syncer::SyncData sync_data = | 4555 syncer::SyncData sync_data = |
| 4551 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4556 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4552 syncer::SyncChange sync_change( | 4557 syncer::SyncChange sync_change(FROM_HERE, |
| 4553 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4558 syncer::SyncChange::ACTION_UPDATE, |
| 4559 sync_data); |
| 4554 syncer::SyncChangeList list(1); | 4560 syncer::SyncChangeList list(1); |
| 4555 list[0] = sync_change; | 4561 list[0] = sync_change; |
| 4556 | 4562 |
| 4557 // Should again do nothing. | 4563 // Should again do nothing. |
| 4558 service_->ProcessSyncChanges(FROM_HERE, list); | 4564 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4559 EXPECT_TRUE(service_->GetExtensionById(good_crx, false)); | 4565 EXPECT_TRUE(service_->GetExtensionById(good_crx, false)); |
| 4560 } | 4566 } |
| 4561 } | 4567 } |
| 4562 | 4568 |
| 4563 TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { | 4569 TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 4576 sync_pb::EntitySpecifics specifics; | 4582 sync_pb::EntitySpecifics specifics; |
| 4577 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); | 4583 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); |
| 4578 ext_specifics->set_id(good_crx); | 4584 ext_specifics->set_id(good_crx); |
| 4579 ext_specifics->set_version( | 4585 ext_specifics->set_version( |
| 4580 service_->GetInstalledExtension(good_crx)->version()->GetString()); | 4586 service_->GetInstalledExtension(good_crx)->version()->GetString()); |
| 4581 ext_specifics->set_enabled(false); | 4587 ext_specifics->set_enabled(false); |
| 4582 | 4588 |
| 4583 { | 4589 { |
| 4584 syncer::SyncData sync_data = | 4590 syncer::SyncData sync_data = |
| 4585 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4591 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4586 syncer::SyncChange sync_change( | 4592 syncer::SyncChange sync_change(FROM_HERE, |
| 4587 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4593 syncer::SyncChange::ACTION_UPDATE, |
| 4594 sync_data); |
| 4588 syncer::SyncChangeList list(1); | 4595 syncer::SyncChangeList list(1); |
| 4589 list[0] = sync_change; | 4596 list[0] = sync_change; |
| 4590 service_->ProcessSyncChanges(FROM_HERE, list); | 4597 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4591 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); | 4598 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); |
| 4592 EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx)); | 4599 EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx)); |
| 4593 } | 4600 } |
| 4594 | 4601 |
| 4595 { | 4602 { |
| 4596 ext_specifics->set_enabled(true); | 4603 ext_specifics->set_enabled(true); |
| 4597 ext_specifics->set_incognito_enabled(true); | 4604 ext_specifics->set_incognito_enabled(true); |
| 4598 syncer::SyncData sync_data = | 4605 syncer::SyncData sync_data = |
| 4599 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4606 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4600 syncer::SyncChange sync_change( | 4607 syncer::SyncChange sync_change(FROM_HERE, |
| 4601 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4608 syncer::SyncChange::ACTION_UPDATE, |
| 4609 sync_data); |
| 4602 syncer::SyncChangeList list(1); | 4610 syncer::SyncChangeList list(1); |
| 4603 list[0] = sync_change; | 4611 list[0] = sync_change; |
| 4604 service_->ProcessSyncChanges(FROM_HERE, list); | 4612 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4605 EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); | 4613 EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); |
| 4606 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); | 4614 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); |
| 4607 } | 4615 } |
| 4608 | 4616 |
| 4609 { | 4617 { |
| 4610 ext_specifics->set_enabled(false); | 4618 ext_specifics->set_enabled(false); |
| 4611 ext_specifics->set_incognito_enabled(true); | 4619 ext_specifics->set_incognito_enabled(true); |
| 4612 syncer::SyncData sync_data = | 4620 syncer::SyncData sync_data = |
| 4613 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4621 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4614 syncer::SyncChange sync_change( | 4622 syncer::SyncChange sync_change(FROM_HERE, |
| 4615 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4623 syncer::SyncChange::ACTION_UPDATE, |
| 4624 sync_data); |
| 4616 syncer::SyncChangeList list(1); | 4625 syncer::SyncChangeList list(1); |
| 4617 list[0] = sync_change; | 4626 list[0] = sync_change; |
| 4618 service_->ProcessSyncChanges(FROM_HERE, list); | 4627 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4619 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); | 4628 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); |
| 4620 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); | 4629 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); |
| 4621 } | 4630 } |
| 4622 | 4631 |
| 4623 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); | 4632 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); |
| 4624 } | 4633 } |
| 4625 | 4634 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 4638 | 4647 |
| 4639 sync_pb::EntitySpecifics specifics; | 4648 sync_pb::EntitySpecifics specifics; |
| 4640 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); | 4649 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); |
| 4641 ext_specifics->set_id(good_crx); | 4650 ext_specifics->set_id(good_crx); |
| 4642 ext_specifics->set_version( | 4651 ext_specifics->set_version( |
| 4643 service_->GetInstalledExtension(good_crx)->version()->GetString()); | 4652 service_->GetInstalledExtension(good_crx)->version()->GetString()); |
| 4644 ext_specifics->set_enabled(false); | 4653 ext_specifics->set_enabled(false); |
| 4645 ext_specifics->set_incognito_enabled(true); | 4654 ext_specifics->set_incognito_enabled(true); |
| 4646 syncer::SyncData sync_data = | 4655 syncer::SyncData sync_data = |
| 4647 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4656 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4648 syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); | 4657 syncer::SyncChange sync_change(FROM_HERE, |
| 4658 syncer::SyncChange::ACTION_UPDATE, |
| 4659 sync_data); |
| 4649 syncer::SyncChangeList list(1); | 4660 syncer::SyncChangeList list(1); |
| 4650 list[0] = sync_change; | 4661 list[0] = sync_change; |
| 4651 | 4662 |
| 4652 service_->ProcessSyncChanges(FROM_HERE, list); | 4663 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4653 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); | 4664 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); |
| 4654 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); | 4665 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); |
| 4655 | 4666 |
| 4656 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); | 4667 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); |
| 4657 } | 4668 } |
| 4658 | 4669 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 4672 sync_pb::EntitySpecifics specifics; | 4683 sync_pb::EntitySpecifics specifics; |
| 4673 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); | 4684 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); |
| 4674 ext_specifics->set_id(good_crx); | 4685 ext_specifics->set_id(good_crx); |
| 4675 ext_specifics->set_enabled(true); | 4686 ext_specifics->set_enabled(true); |
| 4676 | 4687 |
| 4677 { | 4688 { |
| 4678 ext_specifics->set_version( | 4689 ext_specifics->set_version( |
| 4679 service_->GetInstalledExtension(good_crx)->version()->GetString()); | 4690 service_->GetInstalledExtension(good_crx)->version()->GetString()); |
| 4680 syncer::SyncData sync_data = | 4691 syncer::SyncData sync_data = |
| 4681 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4692 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4682 syncer::SyncChange sync_change( | 4693 syncer::SyncChange sync_change(FROM_HERE, |
| 4683 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4694 syncer::SyncChange::ACTION_UPDATE, |
| 4695 sync_data); |
| 4684 syncer::SyncChangeList list(1); | 4696 syncer::SyncChangeList list(1); |
| 4685 list[0] = sync_change; | 4697 list[0] = sync_change; |
| 4686 | 4698 |
| 4687 // Should do nothing if extension version == sync version. | 4699 // Should do nothing if extension version == sync version. |
| 4688 service_->ProcessSyncChanges(FROM_HERE, list); | 4700 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4689 EXPECT_FALSE(service_->updater()->WillCheckSoon()); | 4701 EXPECT_FALSE(service_->updater()->WillCheckSoon()); |
| 4690 } | 4702 } |
| 4691 | 4703 |
| 4692 // Should do nothing if extension version > sync version (but see | 4704 // Should do nothing if extension version > sync version (but see |
| 4693 // the TODO in ProcessExtensionSyncData). | 4705 // the TODO in ProcessExtensionSyncData). |
| 4694 { | 4706 { |
| 4695 ext_specifics->set_version("0.0.0.0"); | 4707 ext_specifics->set_version("0.0.0.0"); |
| 4696 syncer::SyncData sync_data = | 4708 syncer::SyncData sync_data = |
| 4697 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4709 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4698 syncer::SyncChange sync_change( | 4710 syncer::SyncChange sync_change(FROM_HERE, |
| 4699 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4711 syncer::SyncChange::ACTION_UPDATE, |
| 4712 sync_data); |
| 4700 syncer::SyncChangeList list(1); | 4713 syncer::SyncChangeList list(1); |
| 4701 list[0] = sync_change; | 4714 list[0] = sync_change; |
| 4702 | 4715 |
| 4703 service_->ProcessSyncChanges(FROM_HERE, list); | 4716 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4704 EXPECT_FALSE(service_->updater()->WillCheckSoon()); | 4717 EXPECT_FALSE(service_->updater()->WillCheckSoon()); |
| 4705 } | 4718 } |
| 4706 | 4719 |
| 4707 // Should kick off an update if extension version < sync version. | 4720 // Should kick off an update if extension version < sync version. |
| 4708 { | 4721 { |
| 4709 ext_specifics->set_version("9.9.9.9"); | 4722 ext_specifics->set_version("9.9.9.9"); |
| 4710 syncer::SyncData sync_data = | 4723 syncer::SyncData sync_data = |
| 4711 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4724 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4712 syncer::SyncChange sync_change( | 4725 syncer::SyncChange sync_change(FROM_HERE, |
| 4713 syncer::SyncChange::ACTION_UPDATE, sync_data); | 4726 syncer::SyncChange::ACTION_UPDATE, |
| 4727 sync_data); |
| 4714 syncer::SyncChangeList list(1); | 4728 syncer::SyncChangeList list(1); |
| 4715 list[0] = sync_change; | 4729 list[0] = sync_change; |
| 4716 | 4730 |
| 4717 service_->ProcessSyncChanges(FROM_HERE, list); | 4731 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4718 EXPECT_TRUE(service_->updater()->WillCheckSoon()); | 4732 EXPECT_TRUE(service_->updater()->WillCheckSoon()); |
| 4719 } | 4733 } |
| 4720 | 4734 |
| 4721 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); | 4735 EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx)); |
| 4722 } | 4736 } |
| 4723 | 4737 |
| 4724 TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) { | 4738 TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) { |
| 4725 InitializeExtensionServiceWithUpdater(); | 4739 InitializeExtensionServiceWithUpdater(); |
| 4726 InitializeRequestContext(); | 4740 InitializeRequestContext(); |
| 4727 TestSyncProcessorStub processor; | 4741 TestSyncProcessorStub processor; |
| 4728 service_->MergeDataAndStartSyncing( | 4742 service_->MergeDataAndStartSyncing( |
| 4729 syncer::EXTENSIONS, syncer::SyncDataList(), | 4743 syncer::EXTENSIONS, syncer::SyncDataList(), |
| 4730 scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), | 4744 scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), |
| 4731 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); | 4745 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); |
| 4732 | 4746 |
| 4733 sync_pb::EntitySpecifics specifics; | 4747 sync_pb::EntitySpecifics specifics; |
| 4734 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); | 4748 sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); |
| 4735 ext_specifics->set_id(good_crx); | 4749 ext_specifics->set_id(good_crx); |
| 4736 ext_specifics->set_enabled(false); | 4750 ext_specifics->set_enabled(false); |
| 4737 ext_specifics->set_incognito_enabled(true); | 4751 ext_specifics->set_incognito_enabled(true); |
| 4738 ext_specifics->set_update_url("http://www.google.com/"); | 4752 ext_specifics->set_update_url("http://www.google.com/"); |
| 4739 ext_specifics->set_version("1.2.3.4"); | 4753 ext_specifics->set_version("1.2.3.4"); |
| 4740 syncer::SyncData sync_data = | 4754 syncer::SyncData sync_data = |
| 4741 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 4755 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
| 4742 syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); | 4756 syncer::SyncChange sync_change(FROM_HERE, |
| 4757 syncer::SyncChange::ACTION_UPDATE, |
| 4758 sync_data); |
| 4743 syncer::SyncChangeList list(1); | 4759 syncer::SyncChangeList list(1); |
| 4744 list[0] = sync_change; | 4760 list[0] = sync_change; |
| 4745 | 4761 |
| 4746 | 4762 |
| 4747 EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); | 4763 EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); |
| 4748 EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx)); | 4764 EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx)); |
| 4749 service_->ProcessSyncChanges(FROM_HERE, list); | 4765 service_->ProcessSyncChanges(FROM_HERE, list); |
| 4750 EXPECT_TRUE(service_->updater()->WillCheckSoon()); | 4766 EXPECT_TRUE(service_->updater()->WillCheckSoon()); |
| 4751 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); | 4767 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); |
| 4752 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); | 4768 EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx)); |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5227 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 5243 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
| 5228 data_dir_.AppendASCII("hosted_app.crx")); | 5244 data_dir_.AppendASCII("hosted_app.crx")); |
| 5229 | 5245 |
| 5230 service_->CheckForExternalUpdates(); | 5246 service_->CheckForExternalUpdates(); |
| 5231 loop_.RunAllPending(); | 5247 loop_.RunAllPending(); |
| 5232 | 5248 |
| 5233 ASSERT_TRUE(service_->PopulateExtensionGlobalError( | 5249 ASSERT_TRUE(service_->PopulateExtensionGlobalError( |
| 5234 extension_global_error.get())); | 5250 extension_global_error.get())); |
| 5235 ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size()); | 5251 ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size()); |
| 5236 } | 5252 } |
| OLD | NEW |