3 files changed, 1 insertions, 70 deletions

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c3fa897..acebb252 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -139,7 +139,6 @@
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/navigation_controller.h"
-#include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/user_metrics.h"
@@ -1665,11 +1664,8 @@ void Browser::ToggleFullscreenMode() {
 }
 
 void Browser::NotifyTabOfFullscreenExitIfNecessary() {
-  if (fullscreened_tab_) {
+  if (fullscreened_tab_)
     fullscreened_tab_->ExitFullscreenMode();
-    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        Source<NavigationController>(&fullscreened_tab_->controller()));
-  }
   fullscreened_tab_ = NULL;
   tab_caused_fullscreen_ = false;
 }
@@ -3787,12 +3783,6 @@ void Browser::ToggleFullscreenModeForTab(TabContents* tab,
 #endif
     if (!in_correct_mode_for_tab_fullscreen)
       tab_caused_fullscreen_ = true;
-    registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        Source<NavigationController>(&fullscreened_tab_->controller()));
-  } else {
-    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        Source<NavigationController>(&fullscreened_tab_->controller()));
-    fullscreened_tab_ = NULL;
   }
 
   if (tab_caused_fullscreen_) {
@@ -4130,13 +4120,6 @@ void Browser::Observe(int type,
         UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE);
       break;
 
-    case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      if (Details<content::LoadCommittedDetails>(details)->
-          is_navigation_to_different_page())
-        ExitTabbedFullscreenModeIfNecessary();
-      break;
-    }
-
     default:
       NOTREACHED() << "Got a notification we didn't register for.";
   }
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index fe378a7..7d9d130 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -843,9 +843,6 @@ class Browser : public TabHandlerDelegate,
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsFullscreenOnNavigation);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest,
-                           TestTabDoesntExitFullscreenOnSubFrameNavigation);
   FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
   FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
   FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index d66a233..387bdf4 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -68,8 +68,6 @@ const FilePath::CharType* kBeforeUnloadFile =
 
 const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
 const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
-const FilePath::CharType* kSubFrameNavigationFile =
-    FILE_PATH_LITERAL("subframe-navigation.html");
 
 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
 
@@ -858,53 +856,6 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsItselfFromFullscreen) {
   }
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserTest, TestTabExitsFullscreenOnNavigation) {
-  ASSERT_TRUE(test_server()->Start());
-
-  ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
-  ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
-
-  TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
-
-  ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
-      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
-      NotificationService::AllSources());
-  browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
-  tree_updated_observer1.Wait();
-
-  ASSERT_TRUE(browser()->window()->IsFullscreen());
-
-  ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
-      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
-      NotificationService::AllSources());
-  browser()->GoBack(CURRENT_TAB);
-  tree_updated_observer2.Wait();
-
-  ASSERT_FALSE(browser()->window()->IsFullscreen());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserTest,
-                       TestTabDoesntExitFullscreenOnSubFrameNavigation) {
-  ASSERT_TRUE(test_server()->Start());
-
-  GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
-                                     FilePath(kSubFrameNavigationFile)));
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  TabContents* fullscreen_tab = browser()->GetSelectedTabContents();
-
-  ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
-      chrome::NOTIFICATION_FULLSCREEN_CHANGED,
-      NotificationService::AllSources());
-  browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
-  tree_updated_observer1.Wait();
-  ASSERT_TRUE(browser()->window()->IsFullscreen());
-
-  fullscreen_tab->render_view_host()->
-      ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("navigate();"));
-  ASSERT_TRUE(browser()->window()->IsFullscreen());
-}
-
 #if defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(BrowserTest, TabEntersPresentationModeFromWindowed) {
   ASSERT_TRUE(test_server()->Start());