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

chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include <vector>
 
 #import "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "content/browser/site_instance.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+using content::SiteInstance;
 using content::WebContents;
 
 @interface TestTabStripControllerDelegate
     : NSObject<TabStripControllerDelegate> {
 }
 @end
 
 @implementation TestTabStripControllerDelegate
 - (void)onActivateTabWithContents:(WebContents*)contents {
 }
@@ skipping 129 matching lines @@
   TabStripModel* model_;
   scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_;
   scoped_nsobject<TabStripController> controller_;
   scoped_nsobject<TabStripView> tab_strip_;
 };
 
 // Test adding and removing tabs and making sure that views get added to
 // the tab strip.
 TEST_F(TabStripControllerTest, AddRemoveTabs) {
   EXPECT_TRUE(model_->empty());
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
+  SiteInstance* instance = SiteInstance::Create(profile());
   TabContentsWrapper* tab_contents =
       Browser::TabContentsFactory(profile(), instance,
           MSG_ROUTING_NONE, NULL, NULL);
   model_->AppendTabContents(tab_contents, true);
   EXPECT_EQ(model_->count(), 1);
 }
 
 TEST_F(TabStripControllerTest, SelectTab) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 TEST_F(TabStripControllerTest, RearrangeTabs) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 // Test that changing the number of tabs broadcasts a
 // kTabStripNumberOfTabsChanged notifiction.
 TEST_F(TabStripControllerTest, Notifications) {
   // TODO(pinkerton): Implement http://crbug.com/10899
 }
 
 TEST_F(TabStripControllerTest, CorrectToolTipText) {
   // Create tab 1.
-  SiteInstance* instance = SiteInstance::CreateSiteInstance(profile());
+  SiteInstance* instance = SiteInstance::Create(profile());
   TabContentsWrapper* tab_contents =
   Browser::TabContentsFactory(profile(), instance,
                               MSG_ROUTING_NONE, NULL, NULL);
   model_->AppendTabContents(tab_contents, true);
 
   // Create tab 2.
-  SiteInstance* instance2 = SiteInstance::CreateSiteInstance(profile());
+  SiteInstance* instance2 = SiteInstance::Create(profile());
   TabContentsWrapper* tab_contents2 =
   Browser::TabContentsFactory(profile(), instance2,
                               MSG_ROUTING_NONE, NULL, NULL);
   model_->AppendTabContents(tab_contents2, true);
 
   // Set tab 1 tooltip.
   TabView* tab1 = (TabView*)[controller_.get() viewAtIndex:0];
   [tab1 setToolTip:@"Tab1"];
 
   // Set tab 2 tooltip.
@@ skipping 68 matching lines @@
 
   [controller_.get() mouseMoved:event];
   EXPECT_STREQ("Tab2",
       [[controller_ view:nil
         stringForToolTip:nil
                    point:NSMakePoint(0,0)
                 userData:nil] cStringUsingEncoding:NSASCIIStringEncoding]);
 }
 
 }  // namespace