Don't process TabStripModelChange::kRemove changes in TabSharingUIViews.

The logic for kRemove tab strip model changes is covered in
OnInfobarRemoved.

Drive-by reset tab capture indicator on StopSharing. This wasn't a
bug, the indicator would get destroyed in dtor, but it's more logical to
remove it on StopSharing and it makes testing easier.

Bug: 996722
Change-Id: I49943226dcc4fc7eab8a4776f45aaa7c9fd98d5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855738Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Marina Ciocea <marinaciocea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705032}

chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.cc

@@ -168,6 +168,7 @@ void TabSharingUIViews::StopSharing() {
     std::move(stop_callback_).Run();
   RemoveInfobarsForAllTabs();
   SetContentsBorderVisible(shared_tab_, false);
+  tab_capture_indicator_ui_.reset();
   shared_tab_ = nullptr;
 }
 
@@ -180,7 +181,6 @@ void TabSharingUIViews::OnBrowserRemoved(Browser* browser) {
   BrowserList* browser_list = BrowserList::GetInstance();
   if (browser_list->empty())
     browser_list->RemoveObserver(this);
-
   browser->tab_strip_model()->RemoveObserver(this);
 }
 
@@ -193,17 +193,6 @@ void TabSharingUIViews::OnTabStripModelChanged(
       if (infobars_.find(contents.contents) == infobars_.end())
         CreateInfobarForWebContents(contents.contents);
     }
-  } else if (change.type() == TabStripModelChange::kRemoved) {
-    auto* remove = change.GetRemove();
-    if (remove->will_be_deleted) {
-      bool remove_shared_tab = false;
-      for (const auto& contents : remove->contents) {
-        remove_shared_tab |= contents.contents == shared_tab_;
-        infobars_.erase(contents.contents);
-      }
-      if (remove_shared_tab)
-        StopSharing();
-    }
   }
 
   if (selection.active_tab_changed()) {
@@ -227,18 +216,18 @@ void TabSharingUIViews::TabChangedAt(content::WebContents* contents,
     CreateInfobarForWebContents(contents);
 }
 
-void TabSharingUIViews::OnInfoBarRemoved(infobars::InfoBar* info_bar,
+void TabSharingUIViews::OnInfoBarRemoved(infobars::InfoBar* infobar,
                                          bool animate) {
   auto infobars_entry = std::find_if(infobars_.begin(), infobars_.end(),
-                                     [info_bar](const auto& infobars_entry) {
-                                       return infobars_entry.second == info_bar;
+                                     [infobar](const auto& infobars_entry) {
+                                       return infobars_entry.second == infobar;
                                      });
   if (infobars_entry == infobars_.end())
     return;
 
-  info_bar->owner()->RemoveObserver(this);
+  infobar->owner()->RemoveObserver(this);
   infobars_.erase(infobars_entry);
-  if (infobars_entry->first == shared_tab_)
+  if (InfoBarService::WebContentsFromInfoBar(infobar) == shared_tab_)
     StopSharing();
 }