Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/webui/web_ui_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/common/url_constants.h"
@@ skipping 27 matching lines @@
  public:
   WebUITest() : ui_thread_(BrowserThread::UI, MessageLoop::current()) {}
 
   // Tests navigating with a Web UI from a fresh (nothing pending or committed)
   // state, through pending, committed, then another navigation. The first page
   // ID that we should use is passed as a parameter. We'll use the next two
   // values. This must be increasing for the life of the tests.
   static void DoNavigationTest(TabContents* tab_contents, int page_id) {
     WebContents* contents = tab_contents->web_contents();
     NavigationController* controller = &contents->GetController();
+    FaviconTabHelper* favicon_tab_helper =
+        FaviconTabHelper::FromWebContents(contents);
 
     // Start a pending load.
     GURL new_tab_url(chrome::kChromeUINewTabURL);
     controller->LoadURL(new_tab_url, content::Referrer(),
                         content::PAGE_TRANSITION_LINK,
                         std::string());
 
     // The navigation entry should be pending with no committed entry.
     ASSERT_TRUE(controller->GetPendingEntry());
     ASSERT_FALSE(controller->GetLastCommittedEntry());
 
     // Check the things the pending Web UI should have set.
-    EXPECT_FALSE(tab_contents->favicon_tab_helper()->ShouldDisplayFavicon());
+    EXPECT_FALSE(favicon_tab_helper->ShouldDisplayFavicon());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Now commit the load.
     RenderViewHostTester::For(
         contents->GetRenderViewHost())->SendNavigate(page_id, new_tab_url);
 
     // The same flags should be set as before now that the load has committed.
-    EXPECT_FALSE(tab_contents->favicon_tab_helper()->ShouldDisplayFavicon());
+    EXPECT_FALSE(favicon_tab_helper->ShouldDisplayFavicon());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Start a pending navigation to a regular page.
     GURL next_url("http://google.com/");
     controller->LoadURL(next_url, content::Referrer(),
                         content::PAGE_TRANSITION_LINK,
                         std::string());
 
     // Check the flags. Some should reflect the new page (URL, title), some
     // should reflect the old one (bookmark bar) until it has committed.
-    EXPECT_TRUE(tab_contents->favicon_tab_helper()->ShouldDisplayFavicon());
+    EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
 
     // Commit the regular page load. Note that we must send it to the "pending"
     // RenderViewHost if there is one, since this transition will also cause a
     // process transition, and our RVH pointer will be the "committed" one.
     // In the second call to this function from WebUIToStandard, it won't
     // actually be pending, which is the point of this test.
     RenderViewHost* pending_rvh =
         RenderViewHostTester::GetPendingForController(controller);
     if (pending_rvh) {
       RenderViewHostTester::For(
           pending_rvh)->SendNavigate(page_id + 1, next_url);
     } else {
       RenderViewHostTester::For(
           contents->GetRenderViewHost())->SendNavigate(page_id + 1, next_url);
     }
 
     // The state should now reflect a regular page.
-    EXPECT_TRUE(tab_contents->favicon_tab_helper()->ShouldDisplayFavicon());
+    EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
   }
 
  private:
   content::TestBrowserThread ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUITest);
 };
 
 // Tests that the New Tab Page flags are correctly set and propogated by
@@ skipping 22 matching lines @@
                        std::string());
   rvh_tester()->SendNavigate(1, new_tab_url);
 
   // Start another pending load of the new tab page.
   controller().LoadURL(new_tab_url, content::Referrer(),
                        content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh_tester()->SendNavigate(2, new_tab_url);
 
   // The flags should be the same as the non-pending state.
-  EXPECT_FALSE(tab_contents()->favicon_tab_helper()->ShouldDisplayFavicon());
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(contents());
+  EXPECT_FALSE(favicon_tab_helper->ShouldDisplayFavicon());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 }
 
 TEST_F(WebUITest, StandardToWebUI) {
   // Start a pending navigation to a regular page.
   GURL std_url("http://google.com/");
 
   controller().LoadURL(std_url, content::Referrer(),
                        content::PAGE_TRANSITION_LINK,
                        std::string());
 
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(contents());
   // The state should now reflect the default.
-  EXPECT_TRUE(tab_contents()->favicon_tab_helper()->ShouldDisplayFavicon());
+  EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Commit the load, the state should be the same.
   rvh_tester()->SendNavigate(1, std_url);
-  EXPECT_TRUE(tab_contents()->favicon_tab_helper()->ShouldDisplayFavicon());
+  EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Start a pending load for a WebUI.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
   controller().LoadURL(new_tab_url, content::Referrer(),
                        content::PAGE_TRANSITION_LINK,
                        std::string());
-  EXPECT_TRUE(tab_contents()->favicon_tab_helper()->ShouldDisplayFavicon());
+  EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 
   // Committing Web UI is tested above.
 }
 
 TEST_F(WebUITest, FocusOnNavigate) {
   // Setup.  |wc| will be used to track when we try to focus the location bar.
   WebContents* wc =
       WebContentsTester::CreateTestWebContentsCountSetFocusToLocationBar(
           contents()->GetBrowserContext(),
@@ skipping 36 matching lines @@
   focus_called = wct->GetNumberOfFocusCalls();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   old_rvh = rvh();
   RenderViewHostTester::For(old_rvh)->SendShouldCloseACK(true);
   RenderViewHostTester::For(
       pending_rvh())->SendNavigate(next_page_id, next_url);
   RenderViewHostTester::For(old_rvh)->SimulateSwapOutACK();
   EXPECT_EQ(focus_called, wct->GetNumberOfFocusCalls());
 }