Drop url_constants dependency in content/.

content/browser/site_instance.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 "content/browser/site_instance.h"
 
-#include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/webui/web_ui_factory.h"
+#include "content/common/content_client.h"
 #include "content/common/notification_service.h"
-#include "content/common/content_client.h"
+#include "content/common/url_constants.h"
 #include "net/base/registry_controlled_domain.h"
 
-// We treat javascript:, about:crash, about:hang, and about:shorthang as the
-// same site as any URL since they are actually modifiers on existing pages.
 static bool IsURLSameAsAnySiteInstance(const GURL& url) {
   if (!url.is_valid())
     return false;
-  return url.SchemeIs(chrome::kJavaScriptScheme) ||
-         url.spec() == chrome::kAboutCrashURL ||
-         url.spec() == chrome::kAboutKillURL ||
-         url.spec() == chrome::kAboutHangURL ||
-         url.spec() == chrome::kAboutShorthangURL;
+
+  // We treat javascript: and about:crash as the same site as any URL since they
+  // are actually modifiers on existing pages.
+  if (url.SchemeIs(chrome::kJavaScriptScheme) ||
+      url.spec() == chrome::kAboutCrashURL) {
+    return true;
+  }
+
+  const std::set<std::string>* schemes =
+      content::GetContentClient()->browser()->GetSchemesSameAsAnySiteInstance();

[jam, 2011/05/18 22:12:29]

instead of getting a set back of urls that the content layer doesn't care about
(and having to null check), why not just have

bool ContentBrowserClient::IsURLSameAsAnySiteInstance(const GURL&url)

?

[Avi (use Gerrit), 2011/05/18 22:13:59]

Much better idea, thanks! Will do that.

+  if (!schemes)
+    return false;
+
+  return schemes->find(url.spec()) != schemes->end();
 }
 
 int32 SiteInstance::next_site_instance_id_ = 1;
 
 SiteInstance::SiteInstance(BrowsingInstance* browsing_instance)
     : id_(next_site_instance_id_++),
       browsing_instance_(browsing_instance),
       render_process_host_factory_(NULL),
       process_(NULL),
       max_page_id_(-1),
@@ skipping 184 matching lines @@
 }
 
 void SiteInstance::Observe(NotificationType type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == NotificationType::RENDERER_PROCESS_TERMINATED);
   RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   if (rph == process_)
     process_ = NULL;
 }