Skip to content

GitLab

T
tangled
Commit 8bc34040 authored by Saurabh Nijhara's avatar Saurabh Nijhara Committed by Chromium LUCI CQ
Browse files
Options

Correct enum value names as per style guide 

The C++ style guide suggests that enums should be named like constants,
not like macros. This CL adapts the new style for ExtensionStatus enum
in force_installed_tracker.

Bug: 1167661
Change-Id: If74d7b647c9d484d510fdae04df722fda5b43cbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2633270Reviewed-by: default avatarSwapnil Gupta <swapnilgupta@google.com>
Reviewed-by: default avatarOleg Davydov <burunduk@chromium.org>
Commit-Queue: Saurabh Nijhara <snijhara@google.com>
Cr-Commit-Position: refs/heads/master@{#844727}
parent c0558412
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 81 deletions
chrome/browser/extensions/forced_extensions/force_installed_metrics.cc
View file @ 8bc34040
......@@ -274,13 +274,13 @@ ForceInstalledMetrics::~ForceInstalledMetrics() = default;
bool ForceInstalledMetrics::IsStatusGood(ExtensionStatus status) {
switch (status) {
case ExtensionStatus::PENDING:
case ExtensionStatus::kPending:
return false;
case ExtensionStatus::LOADED:
case ExtensionStatus::kLoaded:
return true;
case ExtensionStatus::READY:
case ExtensionStatus::kReady:
return true;
case ExtensionStatus::FAILED:
case ExtensionStatus::kFailed:
return false;
default:
NOTREACHED();
......@@ -300,7 +300,7 @@ void ForceInstalledMetrics::ReportDisableReason(
void ForceInstalledMetrics::ReportMetricsOnExtensionsReady() {
for (const auto& extension : tracker_->extensions()) {
if (extension.second.status != ExtensionStatus::READY)
if (extension.second.status != ExtensionStatus::kReady)
return;
}
base::UmaHistogramLongTimes("Extensions.ForceInstalledReadyTime",
......
chrome/browser/extensions/forced_extensions/force_installed_test_base.cc
View file @ 8bc34040
......@@ -111,13 +111,13 @@ scoped_refptr<const Extension> ForceInstalledTestBase::CreateNewExtension(
const ForceInstalledTracker::ExtensionStatus& status) {
auto ext = ExtensionBuilder(extension_name).SetID(extension_id).Build();
switch (status) {
case ForceInstalledTracker::ExtensionStatus::PENDING:
case ForceInstalledTracker::ExtensionStatus::FAILED:
case ForceInstalledTracker::ExtensionStatus::kPending:
case ForceInstalledTracker::ExtensionStatus::kFailed:
break;
case ForceInstalledTracker::ExtensionStatus::LOADED:
case ForceInstalledTracker::ExtensionStatus::kLoaded:
force_installed_tracker()->OnExtensionLoaded(profile(), ext.get());
break;
case ForceInstalledTracker::ExtensionStatus::READY:
case ForceInstalledTracker::ExtensionStatus::kReady:
force_installed_tracker()->OnExtensionLoaded(profile(), ext.get());
force_installed_tracker()->OnExtensionReady(profile(), ext.get());
}
......
chrome/browser/extensions/forced_extensions/force_installed_tracker.cc
View file @ 8bc34040
......@@ -45,14 +45,14 @@ ForceInstalledTracker::~ForceInstalledTracker() {
void ForceInstalledTracker::UpdateCounters(ExtensionStatus status, int delta) {
switch (status) {
case ExtensionStatus::PENDING:
case ExtensionStatus::kPending:
load_pending_count_ += delta;
FALLTHROUGH;
case ExtensionStatus::LOADED:
case ExtensionStatus::kLoaded:
ready_pending_count_ += delta;
break;
case ExtensionStatus::READY:
case ExtensionStatus::FAILED:
case ExtensionStatus::kReady:
case ExtensionStatus::kFailed:
break;
}
}
......@@ -114,11 +114,11 @@ void ForceInstalledTracker::OnForcedExtensionsPrefReady() {
bool is_from_store =
update_url && *update_url == extension_urls::kChromeWebstoreUpdateURL;
ExtensionStatus status = ExtensionStatus::PENDING;
ExtensionStatus status = ExtensionStatus::kPending;
if (registry_->enabled_extensions().Contains(extension_id)) {
status = registry_->ready_extensions().Contains(extension_id)
? ExtensionStatus::READY
: ExtensionStatus::LOADED;
? ExtensionStatus::kReady
: ExtensionStatus::kLoaded;
}
AddExtensionInfo(extension_id, status, is_from_store);
}
......@@ -143,14 +143,14 @@ void ForceInstalledTracker::RemoveObserver(Observer* obs) {
void ForceInstalledTracker::OnExtensionLoaded(
content::BrowserContext* browser_context,
const Extension* extension) {
ChangeExtensionStatus(extension->id(), ExtensionStatus::LOADED);
ChangeExtensionStatus(extension->id(), ExtensionStatus::kLoaded);
MaybeNotifyObservers();
}
void ForceInstalledTracker::OnExtensionReady(
content::BrowserContext* browser_context,
const Extension* extension) {
ChangeExtensionStatus(extension->id(), ExtensionStatus::READY);
ChangeExtensionStatus(extension->id(), ExtensionStatus::kReady);
MaybeNotifyObservers();
}
......@@ -160,10 +160,10 @@ void ForceInstalledTracker::OnExtensionInstallationFailed(
auto item = extensions_.find(extension_id);
// If the extension is loaded, ignore the failure.
if (item == extensions_.end() ||
item->second.status == ExtensionStatus::LOADED ||
item->second.status == ExtensionStatus::READY)
item->second.status == ExtensionStatus::kLoaded ||
item->second.status == ExtensionStatus::kReady)
return;
ChangeExtensionStatus(extension_id, ExtensionStatus::FAILED);
ChangeExtensionStatus(extension_id, ExtensionStatus::kFailed);
MaybeNotifyObservers();
}
......
chrome/browser/extensions/forced_extensions/force_installed_tracker.h
View file @ 8bc34040
......@@ -101,16 +101,16 @@ class ForceInstalledTracker : public ExtensionRegistryObserver,
enum class ExtensionStatus {
// Extension appears in force-install list, but it not installed yet.
PENDING,
kPending,
// Extension was successfully loaded.
LOADED,
kLoaded,
// Extension is ready. This happens after loading.
READY,
kReady,
// Extension installation failure was reported.
FAILED
kFailed
};
// Helper struct with supplementary info for extensions from force-install
......
chrome/browser/extensions/forced_extensions/force_installed_tracker_unittest.cc
View file @ 8bc34040
......@@ -58,9 +58,9 @@ TEST_F(ForceInstalledTrackerTest, BeforeForceInstallPolicy) {
TEST_F(ForceInstalledTrackerTest, AllExtensionsInstalled) {
SetupForceList(true /*is_from_store */);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::PENDING);
kExtensionName1, kExtensionId1, ExtensionStatus::kPending);
scoped_refptr<const Extension> ext2 = CreateNewExtension(
kExtensionName2, kExtensionId2, ExtensionStatus::PENDING);
kExtensionName2, kExtensionId2, ExtensionStatus::kPending);
EXPECT_FALSE(loaded_called_);
EXPECT_FALSE(ready_called_);
EXPECT_FALSE(force_installed_tracker()->IsDoneLoading());
......@@ -85,7 +85,7 @@ TEST_F(ForceInstalledTrackerTest, AllExtensionsInstalled) {
TEST_F(ForceInstalledTrackerTest, ExtensionPendingInstall) {
SetupForceList(true /*is_from_store */);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::LOADED);
kExtensionName1, kExtensionId1, ExtensionStatus::kLoaded);
EXPECT_FALSE(loaded_called_);
EXPECT_FALSE(ready_called_);
EXPECT_FALSE(force_installed_tracker()->IsDoneLoading());
......@@ -104,9 +104,9 @@ TEST_F(ForceInstalledTrackerTest, ObserversOnlyCalledOnce) {
// observer.
SetupForceList(true /*is_from_store */);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::LOADED);
kExtensionName1, kExtensionId1, ExtensionStatus::kLoaded);
scoped_refptr<const Extension> ext2 = CreateNewExtension(
kExtensionName2, kExtensionId2, ExtensionStatus::LOADED);
kExtensionName2, kExtensionId2, ExtensionStatus::kLoaded);
EXPECT_TRUE(loaded_called_);
force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
......@@ -123,7 +123,7 @@ TEST_F(ForceInstalledTrackerTest, ObserversOnlyCalledOnce) {
TEST_F(ForceInstalledTrackerTest, ExtensionsInstallationFailed) {
SetupForceList(true /*is_from_store */);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::LOADED);
kExtensionName1, kExtensionId1, ExtensionStatus::kLoaded);
force_installed_tracker()->OnExtensionInstallationFailed(
kExtensionId2, InstallStageTracker::FailureReason::INVALID_ID);
EXPECT_TRUE(loaded_called_);
......@@ -137,22 +137,22 @@ TEST_F(ForceInstalledTrackerTest, ExtensionsInstallationFailed) {
TEST_F(ForceInstalledTrackerTest, ExtensionsStatus) {
SetupForceList(true /*is_from_store */);
EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
ExtensionStatus::PENDING);
ExtensionStatus::kPending);
EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId2).status,
ExtensionStatus::PENDING);
ExtensionStatus::kPending);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::LOADED);
kExtensionName1, kExtensionId1, ExtensionStatus::kLoaded);
force_installed_tracker()->OnExtensionInstallationFailed(
kExtensionId2, InstallStageTracker::FailureReason::INVALID_ID);
EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
ExtensionStatus::LOADED);
ExtensionStatus::kLoaded);
EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId2).status,
ExtensionStatus::FAILED);
ExtensionStatus::kFailed);
force_installed_tracker()->OnExtensionReady(profile(), ext1.get());
EXPECT_EQ(force_installed_tracker()->extensions().at(kExtensionId1).status,
ExtensionStatus::READY);
ExtensionStatus::kReady);
}
// This test verifies that resetting the policy before all force installed
......@@ -169,7 +169,7 @@ TEST_F(ForceInstalledTrackerTest, ExtensionsInstallationCancelled) {
TEST_F(ForceInstalledTrackerTest, AllExtensionsReady) {
SetupForceList(true /*is_from_store */);
scoped_refptr<const Extension> ext1 = CreateNewExtension(
kExtensionName1, kExtensionId1, ExtensionStatus::READY);
kExtensionName1, kExtensionId1, ExtensionStatus::kReady);
force_installed_tracker()->OnExtensionInstallationFailed(
kExtensionId2, InstallStageTracker::FailureReason::INVALID_ID);
EXPECT_TRUE(loaded_called_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment