Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove NOT_REACHED() call in brave_domains #26454

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Open

Remove NOT_REACHED() call in brave_domains #26454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion brave_domains/service_domains.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ std::string ConvertEnvironmentToString(brave_domains::ServicesEnvironment env) {
return it->second;
}

NOTREACHED_IN_MIGRATION();
LOG(ERROR) << "Invalid ServicesEnvironment value: " << static_cast<int>(env);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be NOTREACHED actually. We own the enum, which is

enum ServicesEnvironment { DEV, STAGING, PROD };

I particularly think this function should be something like:

std::string ConvertEnvironmentToString(brave_domains::ServicesEnvironment env) {
 switch(env) {
    case ServicesEnvironment::DEV:
       return kBraveServicesSwitchValueDev;
    case ServicesEnvironment::STAGING:
       return kBraveServicesSwitchValueStaging;
    case ServicesEnvironment::PROD:
       return kBraveServicesSwitchValueProduction;  
 }
  NOTREACHED_NORETURN();
}

This way we don't get some hidden bug if a new key is added to brave_domains::ServicesEnvironment.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to do it if you don't feel like, but ideally we should also change this enum from

enum ServicesEnvironment { DEV, STAGING, PROD };

to:

enum class ServicesEnvironment { kDev, kStaging, kProd };

So, if you feel like doing that too....

return kBraveServicesSwitchValueProduction;
}
#endif
Expand Down
Loading