[iOS] Fix InProductHelp for LongPress

This CL fixes an issue where the LongPress InProductHelp wasn't
displayed after displaying the BottomToolbar help as the event was
registered.
This CL registers the bottom_toolbar_opened event when the tip is shown.
It also fixes a couple a minor issues in the bubble presenter.

Bug: 877004
TBR: nyquist@chromium.org
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Id8c3906c6026ae84d1de09d9c953c2cea887f81d
Reviewed-on: https://chromium-review.googlesource.com/1186410Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585755}

components/feature_engagement/public/event_constants.cc

@@ -33,6 +33,7 @@ const char kChromeOpened[] = "chrome_opened";
 const char kIncognitoTabOpened[] = "incognito_tab_opened";
 const char kClearedBrowsingData[] = "cleared_browsing_data";
 const char kViewedReadingList[] = "viewed_reading_list";
+const char kBottomToolbarOpened[] = "bottom_toolbar_opened";
 #endif  // defined(OS_IOS)
 
 }  // namespace events

components/feature_engagement/public/event_constants.h

@@ -64,6 +64,9 @@ extern const char kClearedBrowsingData[];
 
 // The user has viewed their reading list.
 extern const char kViewedReadingList[];
+
+// The user has viewed the the BottomToolbar tip.
+extern const char kBottomToolbarOpened[];
 #endif  // defined(OS_IOS)
 
 }  // namespace events

ios/chrome/browser/ui/bubble/bubble_presenter.mm

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
+#include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/feature_constants.h"
 #include "components/feature_engagement/public/tracker.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ -142,6 +143,7 @@ const CGFloat kBubblePresentationDelay = 1;
   [self.tabTipBubblePresenter dismissAnimated:NO];
   [self.incognitoTabTipBubblePresenter dismissAnimated:NO];
   [self.bottomToolbarTipBubblePresenter dismissAnimated:NO];
+  [self.longPressToolbarTipBubblePresenter dismissAnimated:NO];
 }
 
 - (void)userEnteredTabSwitcher {
@@ -208,7 +210,7 @@ const CGFloat kBubblePresentationDelay = 1;
   if (!presenter)
     return;
 
-  self.bottomToolbarTipBubblePresenter = presenter;
+  self.longPressToolbarTipBubblePresenter = presenter;
 }
 
 // Presents and returns a bubble view controller for the |feature| with an arrow
@@ -266,6 +268,8 @@ presentBubbleForFeature:(const base::Feature&)feature
     return;
 
   self.bottomToolbarTipBubblePresenter = presenter;
+  feature_engagement::TrackerFactory::GetForBrowserState(self.browserState)
+      ->NotifyEvent(feature_engagement::events::kBottomToolbarOpened);
 }
 
 // Optionally presents a bubble associated with the new tab tip in-product help