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

Side by Side Diff: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address issue exposed by failing unit test. Created 6 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/strings/string_number_conversions.h" 6 #include "base/strings/string_number_conversions.h"
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 // Only extension 2 should have become disabled. 713 // Only extension 2 should have become disabled.
714 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL); 714 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
715 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL); 715 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
716 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL); 716 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
717 // No extension should have been acknowledged (it got disabled). 717 // No extension should have been acknowledged (it got disabled).
718 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1)); 718 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1));
719 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2)); 719 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2));
720 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId3)); 720 EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId3));
721 721
722 // Clean up after ourselves. 722 // Clean up after ourselves.
723 service_->UninstallExtension(kId1, false, NULL); 723 service_->UninstallExtension(
724 service_->UninstallExtension(kId2, false, NULL); 724 kId1, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
725 service_->UninstallExtension(kId3, false, NULL); 725 service_->UninstallExtension(
726 kId2, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
727 service_->UninstallExtension(
728 kId3, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
726 } 729 }
727 } 730 }
728 731
729 // The feature this is meant to test is only implemented on Windows. 732 // The feature this is meant to test is only implemented on Windows.
730 #if defined(OS_WIN) 733 #if defined(OS_WIN)
731 #define MAYBE_NtpOverriddenControllerTest NtpOverriddenControllerTest 734 #define MAYBE_NtpOverriddenControllerTest NtpOverriddenControllerTest
732 #else 735 #else
733 #define MAYBE_NtpOverriddenControllerTest DISABLED_NtpOverriddenControllerTest 736 #define MAYBE_NtpOverriddenControllerTest DISABLED_NtpOverriddenControllerTest
734 #endif 737 #endif
735 738
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 // Only extension 2 should have become disabled. 815 // Only extension 2 should have become disabled.
813 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL); 816 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
814 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL); 817 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
815 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL); 818 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
816 // No extension should have been acknowledged (it got disabled). 819 // No extension should have been acknowledged (it got disabled).
817 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1)); 820 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1));
818 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2)); 821 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2));
819 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId3)); 822 EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId3));
820 823
821 // Clean up after ourselves. 824 // Clean up after ourselves.
822 service_->UninstallExtension(kId1, false, NULL); 825 service_->UninstallExtension(
823 service_->UninstallExtension(kId2, false, NULL); 826 kId1, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
824 service_->UninstallExtension(kId3, false, NULL); 827 service_->UninstallExtension(
828 kId2, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
829 service_->UninstallExtension(
830 kId3, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
825 } 831 }
826 832
827 void SetInstallTime(const std::string& extension_id, 833 void SetInstallTime(const std::string& extension_id,
828 const base::Time& time, 834 const base::Time& time,
829 ExtensionPrefs* prefs) { 835 ExtensionPrefs* prefs) {
830 std::string time_str = base::Int64ToString(time.ToInternalValue()); 836 std::string time_str = base::Int64ToString(time.ToInternalValue());
831 prefs->UpdateExtensionPref(extension_id, 837 prefs->UpdateExtensionPref(extension_id,
832 "install_time", 838 "install_time",
833 new base::StringValue(time_str)); 839 new base::StringValue(time_str));
834 } 840 }
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 // Only extension 2 should have become disabled. 938 // Only extension 2 should have become disabled.
933 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL); 939 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
934 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL); 940 EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
935 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL); 941 EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
936 // No extension should have been acknowledged (it got disabled). 942 // No extension should have been acknowledged (it got disabled).
937 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1)); 943 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1));
938 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2)); 944 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2));
939 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3)); 945 EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
940 946
941 // Clean up after ourselves. 947 // Clean up after ourselves.
942 service_->UninstallExtension(kId1, false, NULL); 948 service_->UninstallExtension(
943 service_->UninstallExtension(kId2, false, NULL); 949 kId1, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
944 service_->UninstallExtension(kId3, false, NULL); 950 service_->UninstallExtension(
951 kId2, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
952 service_->UninstallExtension(
953 kId3, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
945 } 954 }
946 955
947 } // namespace extensions 956 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler_unittest.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698