Revert of [Mac] The infobar's top arrow should be hidden while the omnibox popup is shown

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 13ce7a89330bfb1db1bdba4380008b1fa628ad16..2fd4f20fa2362cd5b3c99df981d23eb4abb640b3 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -13,7 +13,6 @@
 #import "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
-#include "base/scoped_observer.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
@@ -65,7 +64,6 @@
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
-#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
@@ -89,9 +87,6 @@
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
-#include "components/omnibox/browser/omnibox_edit_model.h"
-#include "components/omnibox/browser/omnibox_popup_model.h"
-#include "components/omnibox/browser/omnibox_popup_model_observer.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_ui_delegate.h"
@@ -190,43 +185,6 @@
 
 namespace {
 
-// This class shows or hides the top arrow of the infobar in accordance with the
-// visibility of the omnibox popup. It hides the top arrow when the omnibox
-// popup is shown, and vice versa.
-class OmniboxPopupModelObserverBridge final : public OmniboxPopupModelObserver {
- public:
-  explicit OmniboxPopupModelObserverBridge(BrowserWindowController* controller)
-      : controller_(controller),
-        omnibox_popup_model_([controller_ locationBarBridge]
-                                 ->GetOmniboxView()
-                                 ->model()
-                                 ->popup_model()),
-        omnibox_popup_model_observer_(this) {
-    DCHECK(omnibox_popup_model_);
-    omnibox_popup_model_observer_.Add(omnibox_popup_model_);
-  }
-
-  void OnOmniboxPopupShownOrHidden() override {
-    int max_top_arrow_height = 0;
-    if (!omnibox_popup_model_->IsOpen()) {
-      base::scoped_nsobject<BrowserWindowLayout> layout(
-          [[BrowserWindowLayout alloc] init]);
-      [controller_ updateLayoutParameters:layout];
-      max_top_arrow_height = [layout computeLayout].infoBarMaxTopArrowHeight;
-    }
-    [[controller_ infoBarContainerController]
-        setMaxTopArrowHeight:max_top_arrow_height];
-  }
-
- private:
-  BrowserWindowController* controller_;
-  OmniboxPopupModel* omnibox_popup_model_;
-  ScopedObserver<OmniboxPopupModel, OmniboxPopupModelObserver>
-      omnibox_popup_model_observer_;
-
-  DISALLOW_COPY_AND_ASSIGN(OmniboxPopupModelObserverBridge);
-};
-
 void SetUpBrowserWindowCommandHandler(NSWindow* window) {
   // Make the window handle browser window commands.
   [base::mac::ObjCCastStrict<ChromeEventProcessingWindow>(window)
@@ -430,9 +388,6 @@
             [self window],
             extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS,
             windowShim_.get()));
-
-    omniboxPopupModelObserverBridge_.reset(
-        new OmniboxPopupModelObserverBridge(self));
 
     blockLayoutSubviews_ = NO;