1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc b/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
index 2d7634a998d..c9757b537f3 100644
--- a/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
+++ b/chromium/components/performance_manager/execution_context_priority/frame_visibility_voter.cc
@@ -14,7 +14,7 @@ namespace execution_context_priority {
 
 namespace {
 
-const execution_context::ExecutionContext* GetExecutionContext(
+const execution_context::ExecutionContext* GetExecutionContext5(
     const FrameNode* frame_node) {
   return execution_context::ExecutionContextRegistry::GetFromGraph(
              frame_node->GetGraph())
@@ -23,7 +23,7 @@ const execution_context::ExecutionContext* GetExecutionContext(
 
 // Returns a vote with the appropriate priority depending on the frame's
 // |visibility|.
-Vote GetVote(FrameNode::Visibility visibility) {
+Vote GetVote2(FrameNode::Visibility visibility) {
   base::TaskPriority priority;
   switch (visibility) {
     case FrameNode::Visibility::kUnknown:
@@ -53,25 +53,25 @@ void FrameVisibilityVoter::SetVotingChannel(VotingChannel voting_channel) {
 }
 
 void FrameVisibilityVoter::OnFrameNodeAdded(const FrameNode* frame_node) {
-  const Vote vote = GetVote(frame_node->GetVisibility());
-  voting_channel_.SubmitVote(GetExecutionContext(frame_node), vote);
+  const Vote vote = GetVote2(frame_node->GetVisibility());
+  voting_channel_.SubmitVote(GetExecutionContext5(frame_node), vote);
 }
 
 void FrameVisibilityVoter::OnBeforeFrameNodeRemoved(
     const FrameNode* frame_node) {
-  voting_channel_.InvalidateVote(GetExecutionContext(frame_node));
+  voting_channel_.InvalidateVote(GetExecutionContext5(frame_node));
 }
 
 void FrameVisibilityVoter::OnFrameVisibilityChanged(
     const FrameNode* frame_node,
     FrameNode::Visibility previous_value) {
-  const Vote new_vote = GetVote(frame_node->GetVisibility());
+  const Vote new_vote = GetVote2(frame_node->GetVisibility());
 
   // Nothing to change if the new priority is the same as the old one.
-  if (new_vote == GetVote(previous_value))
+  if (new_vote == GetVote2(previous_value))
     return;
 
-  voting_channel_.ChangeVote(GetExecutionContext(frame_node), new_vote);
+  voting_channel_.ChangeVote(GetExecutionContext5(frame_node), new_vote);
 }
 
 }  // namespace execution_context_priority