Revert of Mac: Fix accidental changes to fullscreen logic from refactor.

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 67acc08a906192fe788dd636bbc0ebaecd08e72e..ca9e3b9d5731910b03a5c73914f93b473410f6b3 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2107,11 +2107,11 @@
   return presentationModeController_.get() != nil;
 }
 
-- (void)enterPresentationMode {
-  if (!chrome::mac::SupportsSystemFullscreen()) {
-    [self enterImmersiveFullscreen];
-    return;
-  }
+- (void)enterPresentationModeForURL:(const GURL&)url
+                         bubbleType:(FullscreenExitBubbleType)bubbleType {
+  DCHECK(chrome::mac::SupportsSystemFullscreen());
+  fullscreenUrl_ = url;
+  fullscreenBubbleType_ = bubbleType;
 
   if ([self isInAppKitFullscreen]) {
     // Already in AppKit Fullscreen. Adjust the UI to use Presentation Mode.
@@ -2125,21 +2125,8 @@
   }
 }
 
-- (void)enterExtensionFullscreenForURL:(const GURL&)url
-                            bubbleType:(FullscreenExitBubbleType)bubbleType {
-  if (chrome::mac::SupportsSystemFullscreen()) {
-    fullscreenUrl_ = url;
-    fullscreenBubbleType_ = bubbleType;
-    [self enterPresentationMode];
-  } else {
-    [self enterImmersiveFullscreen];
-    DCHECK(!url.is_empty());
-    [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
-  }
-}
-
-- (void)enterWebContentFullscreenForURL:(const GURL&)url
-                             bubbleType:(FullscreenExitBubbleType)bubbleType {
+- (void)enterHTML5FullscreenForURL:(const GURL&)url
+                        bubbleType:(FullscreenExitBubbleType)bubbleType {
   [self enterImmersiveFullscreen];
   if (!url.is_empty())
     [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];