Move remaining files in content\browser to the content namespace.

content/browser/site_instance_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include "base/command_line.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host_factory.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
-using content::BrowserContext;
-using content::RenderProcessHost;
-using content::RenderProcessHostImpl;
-using content::SiteInstance;
-using content::StoragePartitionImpl;
-using content::WebUIControllerFactory;
+namespace content {
 
 static bool IsURLSameAsAnySiteInstance(const GURL& url) {
   if (!url.is_valid())
     return false;
 
   // We treat javascript: as the same site as any URL since it is actually
   // a modifier on existing pages.
   if (url.SchemeIs(chrome::kJavaScriptScheme))
     return true;
 
   return url == GURL(chrome::kChromeUICrashURL) ||
          url == GURL(chrome::kChromeUIKillURL) ||
          url == GURL(chrome::kChromeUIHangURL) ||
          url == GURL(chrome::kChromeUIShorthangURL);
 }
 
 int32 SiteInstanceImpl::next_site_instance_id_ = 1;
 
 SiteInstanceImpl::SiteInstanceImpl(BrowsingInstance* browsing_instance)
     : id_(next_site_instance_id_++),
       browsing_instance_(browsing_instance),
       render_process_host_factory_(NULL),
       process_(NULL),
       has_site_(false) {
   DCHECK(browsing_instance);
 
-  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_TERMINATED,
+                 NotificationService::AllBrowserContextsAndSources());
 }
 
 SiteInstanceImpl::~SiteInstanceImpl() {
-  content::GetContentClient()->browser()->SiteInstanceDeleting(this);
+  GetContentClient()->browser()->SiteInstanceDeleting(this);
 
   // Now that no one is referencing us, we can safely remove ourselves from
   // the BrowsingInstance.  Any future visits to a page from this site
   // (within the same BrowsingInstance) can safely create a new SiteInstance.
   if (has_site_)
     browsing_instance_->UnregisterSiteInstance(
         static_cast<SiteInstance*>(this));
 }
 
 int32 SiteInstanceImpl::GetId() {
   return id_;
 }
 
 bool SiteInstanceImpl::HasProcess() const {
   if (process_ != NULL)
     return true;
 
   // If we would use process-per-site for this site, also check if there is an
   // existing process that we would use if GetProcess() were called.
-  content::BrowserContext* browser_context =
+  BrowserContext* browser_context =
       browsing_instance_->browser_context();
   if (has_site_ &&
       RenderProcessHostImpl::ShouldUseProcessPerSite(browser_context, site_) &&
       RenderProcessHostImpl::GetProcessHostForSite(browser_context, site_)) {
     return true;
   }
 
   return false;
 }
 
@@ skipping 42 matching lines @@
     CHECK(process_);
 
     // If we are using process-per-site, we need to register this process
     // for the current site so that we can find it again.  (If no site is set
     // at this time, we will register it in SetSite().)
     if (use_process_per_site) {
       RenderProcessHostImpl::RegisterProcessHostForSite(browser_context,
                                                         process_, site_);
     }
 
-    content::GetContentClient()->browser()->SiteInstanceGotProcess(this);
+    GetContentClient()->browser()->SiteInstanceGotProcess(this);
 
     if (has_site_)
       LockToOrigin();
   }
   DCHECK(process_);
 
   return process_;
 }
 
 void SiteInstanceImpl::SetSite(const GURL& url) {
@@ skipping 150 matching lines @@
   // If the schemes differ, they aren't part of the same site.
   if (url1.scheme() != url2.scheme())
     return false;
 
   return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
 }
 
 /*static*/
 GURL SiteInstanceImpl::GetEffectiveURL(BrowserContext* browser_context,
                                        const GURL& url) {
-  return content::GetContentClient()->browser()->
+  return GetContentClient()->browser()->
       GetEffectiveURL(browser_context, url);
 }
 
 void SiteInstanceImpl::Observe(int type,
-                               const content::NotificationSource& source,
-                               const content::NotificationDetails& details) {
-  DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
-  RenderProcessHost* rph = content::Source<RenderProcessHost>(source).ptr();
+                               const NotificationSource& source,
+                               const NotificationDetails& details) {
+  DCHECK(type == NOTIFICATION_RENDERER_PROCESS_TERMINATED);

[tfarina, 2012/10/30 22:19:06]

DCHECK_EQ

+  RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   if (rph == process_)
     process_ = NULL;
 }
 
 void SiteInstanceImpl::LockToOrigin() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableStrictSiteIsolation)) {
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     policy->LockToOrigin(process_->GetID(), site_);
   }
 }
+
+}  // namespace content