Create the correct SiteInstance when restoring tabs that belong to apps.

chrome/browser/tab_contents/tab_util.h

Index: chrome/browser/tab_contents/tab_util.h
diff --git a/chrome/browser/tab_contents/tab_util.h b/chrome/browser/tab_contents/tab_util.h
index 896be7cf81a102796e1fd557ea451d840b1cf20f..8a0eab35b871875f14815d76b432e806922f6643 100644
--- a/chrome/browser/tab_contents/tab_util.h
+++ b/chrome/browser/tab_contents/tab_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,6 +6,9 @@
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_UTIL_H_
 #pragma once
 
+class GURL;
+class Profile;
+class SiteInstance;
 class TabContents;
 
 namespace tab_util {
@@ -15,6 +18,12 @@ namespace tab_util {
 // Should only be called from the UI thread, since it accesses TabContent.
 TabContents* GetTabContentsByID(int render_process_host_id, int routing_id);
 
+// Returns an appropriate SiteInstance to use with the TabContents contructor.
+// Handles WebUI and app URLs, and transitions between sites in the same
+// contents.

[Charlie Reis, 2011/07/19 21:38:28]

Can you keep something like the "or the SiteInstance for |source_contents| if it
represents the same website as |url|.  Returns NULL otherwise" part of the
comment?  I think it more clearly described the behavior of the method.

+SiteInstance* GetSiteInstance(TabContents* source_contents, Profile* profile,
+                              const GURL& url);
+
 }  // namespace tab_util
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_UTIL_H_