bubbles: remove some metrics-gathering hooks

This change:
1) Removes BubbleController::GetName and its various implementations
2) Removes BubbleController::GetVisibleTime and its various implementations
3) Cleans up ExtensionInstalledBubbleBrowserTest to not depend on GetName

Bug: 496955
Change-Id: Iee271ea4d4dbae96f8dd77e2ce2be87bd36ecc3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954260
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722642}

chrome/browser/ui/extensions/extension_installed_bubble.cc

@@ -297,10 +297,6 @@ bool ExtensionInstalledBubble::ShouldClose(BubbleCloseReason reason) const {
   return reason != BUBBLE_CLOSE_NAVIGATED;
 }
 
-std::string ExtensionInstalledBubble::GetName() const {
-  return "ExtensionInstalled";
-}
-
 const content::RenderFrameHost* ExtensionInstalledBubble::OwningFrame() const {
   return nullptr;
 }

chrome/browser/ui/extensions/extension_installed_bubble.h

@@ -89,7 +89,6 @@ class ExtensionInstalledBubble : public BubbleDelegate {
   // BubbleDelegate:
   std::unique_ptr<BubbleUi> BuildBubbleUi() override;
   bool ShouldClose(BubbleCloseReason reason) const override;
-  std::string GetName() const override;
   const content::RenderFrameHost* OwningFrame() const override;
 
   // Returns false if the bubble could not be shown immediately, because of an

chrome/browser/ui/extensions/extension_installed_bubble_browsertest.cc

@@ -41,11 +41,10 @@ class ExtensionInstalledBubbleBrowserTest
 
   BubbleController* GetExtensionBubbleControllerFromManager(
       BubbleManager* manager) const {
-    for (auto& controller : manager->controllers_) {
-      if (controller->GetName() == "ExtensionInstalled")
-        return controller.get();
-    }
-    return nullptr;
+    // TODO(https://crbug.com/496955): This test class should not be aware of BubbleController
+    // or its internals. Figure out an alternate strategy to find the needed BubbleUi instance.
+    return manager->controllers_.size() ? manager->controllers_[0].get()
+                                        : nullptr;
   }
 
   BubbleUi* GetBubbleUiFromManager(BubbleManager* manager) const {

chrome/browser/ui/permission_bubble/chooser_bubble_delegate.cc

@@ -19,10 +19,6 @@ ChooserBubbleDelegate::ChooserBubbleDelegate(
 
 ChooserBubbleDelegate::~ChooserBubbleDelegate() {}
 
-std::string ChooserBubbleDelegate::GetName() const {
-  return "ChooserBubble";
-}
-
 const content::RenderFrameHost* ChooserBubbleDelegate::OwningFrame() const {
   return owning_frame_;
 }

chrome/browser/ui/permission_bubble/chooser_bubble_delegate.h

@@ -25,7 +25,6 @@ class ChooserBubbleDelegate : public BubbleDelegate {
   ~ChooserBubbleDelegate() override;
 
   // BubbleDelegate:
-  std::string GetName() const override;
   std::unique_ptr<BubbleUi> BuildBubbleUi() override;
   const content::RenderFrameHost* OwningFrame() const override;
 

components/bubble/bubble_controller.cc

@@ -27,27 +27,11 @@ bool BubbleController::CloseBubble(BubbleCloseReason reason) {
   return manager_->CloseBubble(this->AsWeakPtr(), reason);
 }
 
-bool BubbleController::UpdateBubbleUi() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (!bubble_ui_)
-    return false;
-  return delegate_->UpdateBubbleUi(bubble_ui_.get());
-}
-
-std::string BubbleController::GetName() const {
-  return delegate_->GetName();
-}
-
-base::TimeDelta BubbleController::GetVisibleTime() const {
-  return base::TimeTicks::Now() - show_time_;
-}
-
 void BubbleController::Show() {
   DCHECK(!bubble_ui_);
   bubble_ui_ = delegate_->BuildBubbleUi();
   DCHECK(bubble_ui_);
   bubble_ui_->Show(AsWeakPtr());
-  show_time_ = base::TimeTicks::Now();
 }
 
 void BubbleController::UpdateAnchorPosition() {

components/bubble/bubble_controller.h

@@ -30,16 +30,6 @@ class BubbleController : public base::SupportsWeakPtr<BubbleController> {
   // Calls CloseBubble on the associated BubbleManager.
   bool CloseBubble(BubbleCloseReason reason);
 
-  // Calls UpdateBubbleUi on the associated BubbleManager.
-  // Returns true if the UI was updated.
-  bool UpdateBubbleUi();
-
-  // Used to identify a bubble for collecting metrics.
-  std::string GetName() const;
-
-  // Used for collecting metrics.
-  base::TimeDelta GetVisibleTime() const;
-
  private:
   friend class BubbleManager;
   friend class ExtensionInstalledBubbleBrowserTest;
@@ -67,9 +57,6 @@ class BubbleController : public base::SupportsWeakPtr<BubbleController> {
   // Verify that functions that affect the UI are done on the same thread.
   base::ThreadChecker thread_checker_;
 
-  // To keep track of the amount of time a bubble was visible.
-  base::TimeTicks show_time_;
-
   DISALLOW_COPY_AND_ASSIGN(BubbleController);
 };
 

components/bubble/bubble_delegate.h

@@ -42,9 +42,6 @@ class BubbleDelegate {
   // Return true to indicate the UI was updated.
   virtual bool UpdateBubbleUi(BubbleUi* bubble_ui);
 
-  // Used to identify a bubble for collecting metrics.
-  virtual std::string GetName() const = 0;
-
   // If this returns non-null, the bubble will be closed when the returned frame
   // is destroyed.
   virtual const content::RenderFrameHost* OwningFrame() const = 0;

components/bubble/bubble_manager_mocks.h

@@ -49,10 +49,6 @@ class MockBubbleDelegate : public BubbleDelegate {
     return std::move(bubble_ui_);
   }
 
-  MOCK_METHOD1(UpdateBubbleUi, bool(BubbleUi*));
-
-  std::string GetName() const override { return "MockBubble"; }
-
   // To verify destructor call.
   MOCK_METHOD0(Destroyed, void());