Define the public interface for content browser SiteInstance. This interface is implemented by th...

chrome/browser/ui/webui/web_ui_unittest.cc

 // Copyright (c) 2011 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/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/site_instance.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::NavigationController;
+using content::SiteInstance;
 using content::WebContents;
 
 class WebUITest : public TabContentsWrapperTestHarness {
  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.
@@ skipping 134 matching lines @@
   int focus_called() const { return focus_called_; }
 
  private:
   int focus_called_;
 };
 
 TEST_F(WebUITest, FocusOnNavigate) {
   // Setup.  |tc| will be used to track when we try to focus the location bar.
   TabContentsForFocusTest* tc = new TabContentsForFocusTest(
       contents()->GetBrowserContext(),
-      SiteInstance::CreateSiteInstance(contents()->GetBrowserContext()));
+      SiteInstance::Create(contents()->GetBrowserContext()));
   tc->GetController().CopyStateFrom(controller());
   SetContents(tc);
   int page_id = 200;
 
   // Load the NTP.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
   controller().LoadURL(new_tab_url, content::Referrer(),
                        content::PAGE_TRANSITION_LINK,
                        std::string());
   rvh()->SendNavigate(page_id, new_tab_url);
@@ skipping 22 matching lines @@
   // Navigate forward.  Shouldn't focus the location bar.
   focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   old_rvh = rvh();
   old_rvh->SendShouldCloseACK(true);
   pending_rvh()->SendNavigate(next_page_id, next_url);
   old_rvh->OnSwapOutACK();
   EXPECT_EQ(focus_called, tc->focus_called());
 }