| Index: chrome/browser/ui/webui/web_ui_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/web_ui_unittest.cc (revision 118703)
|
| +++ chrome/browser/ui/webui/web_ui_unittest.cc (working copy)
|
| @@ -8,9 +8,9 @@
|
| #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"
|
|
|
| @@ -155,7 +155,7 @@
|
| class TabContentsForFocusTest : public TestTabContents {
|
| public:
|
| TabContentsForFocusTest(content::BrowserContext* browser_context,
|
| - SiteInstance* instance)
|
| + content::SiteInstance* instance)
|
| : TestTabContents(browser_context, instance), focus_called_(0) {
|
| }
|
|
|
| @@ -170,7 +170,8 @@
|
| // 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()));
|
| + content::SiteInstance::CreateSiteInstance(
|
| + contents()->GetBrowserContext()));
|
| tc->GetController().CopyStateFrom(controller());
|
| SetContents(tc);
|
| int page_id = 200;
|
|
|