Avoid unnecessary UpdateUI for cookie controls

The UI would get updated twice when cookie blocking was enabled for
a specific site. Avoid this unnecessary step by not stepping through
state updates separately.

Bug: 967668
Change-Id: I9d6c836031dc9ef7adf1a4888b6e8c8483c22ef0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862693
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705951}

chrome/browser/ui/views/location_bar/cookie_controls_bubble_view.cc

@@ -61,7 +61,8 @@ void CookieControlsBubbleView::OnStatusChanged(
     OnBlockedCookiesCountChanged(blocked_cookies);
     return;
   }
-  intermediate_step_ = IntermediateStep::kNone;
+  if (new_status != CookieControlsController::Status::kEnabled)
+    intermediate_step_ = IntermediateStep::kNone;
   status_ = new_status;
   blocked_cookies_ = blocked_cookies;
   UpdateUi();
@@ -268,9 +269,8 @@ bool CookieControlsBubbleView::Accept() {
   } else {
     DCHECK_EQ(status_, CookieControlsController::Status::kDisabledForSite);
     DCHECK_EQ(intermediate_step_, IntermediateStep::kNone);
-    controller_->OnCookieBlockingEnabledForSite(true);
     intermediate_step_ = IntermediateStep::kBlockingIsOn;
-    UpdateUi();
+    controller_->OnCookieBlockingEnabledForSite(true);
   }
   return false;
 }