Removal of Profile from content part 7.

BUG=76788
TEST=no change visible

Review URL: http://codereview.chromium.org/7575010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96046 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 41 insertions, 45 deletions

diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h
index 6e623e9..51829f9 100644
--- a/content/browser/appcache/chrome_appcache_service.h
+++ b/content/browser/appcache/chrome_appcache_service.h
@@ -21,10 +21,10 @@ class ResourceContext;
 }
 
 // An AppCacheService subclass used by the chrome. There is an instance
-// associated with each Profile. This derivation adds refcounting semantics
-// since a profile has multiple URLRequestContexts which refer to the same
-// object, and those URLRequestContexts are refcounted independently of the
-// owning profile.
+// associated with each BrowserContext. This derivation adds refcounting
+// semantics since a browser context has multiple URLRequestContexts which refer
+// to the same object, and those URLRequestContexts are refcounted independently
+// of the owning browser context.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
diff --git a/content/browser/cancelable_request.cc b/content/browser/cancelable_request.cc
index 5e36d89..3b1816f 100644
--- a/content/browser/cancelable_request.cc
+++ b/content/browser/cancelable_request.cc
@@ -11,9 +11,9 @@ CancelableRequestProvider::CancelableRequestProvider()
 CancelableRequestProvider::~CancelableRequestProvider() {
   // There may be requests whose result callback has not been run yet. We need
   // to cancel them otherwise they may try and call us back after we've been
-  // deleted, or do other bad things. This can occur on shutdown (or profile
-  // destruction) when a request is scheduled, completed (but not dispatched),
-  // then the Profile is deleted.
+  // deleted, or do other bad things. This can occur on shutdown (or browser
+  // context destruction) when a request is scheduled, completed (but not
+  // dispatched), then the BrowserContext is deleted.
   base::AutoLock lock(pending_request_lock_);
   while (!pending_requests_.empty())
     CancelRequestLocked(pending_requests_.begin());
diff --git a/content/browser/chrome_blob_storage_context.h b/content/browser/chrome_blob_storage_context.h
index db70d11..3b97011 100644
--- a/content/browser/chrome_blob_storage_context.h
+++ b/content/browser/chrome_blob_storage_context.h
@@ -17,8 +17,9 @@ class BlobStorageController;
 }
 
 // A context class that keeps track of BlobStorageController used by the chrome.
-// There is an instance associated with each Profile. There could be multiple
-// URLRequestContexts in the same profile that refers to the same instance.
+// There is an instance associated with each BrowserContext. There could be
+// multiple URLRequestContexts in the same browser context that refers to the
+// same instance.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
diff --git a/content/browser/download/save_file_manager.h b/content/browser/download/save_file_manager.h
index 0e5d7b6..fb6a9a2 100644
--- a/content/browser/download/save_file_manager.h
+++ b/content/browser/download/save_file_manager.h
@@ -151,7 +151,8 @@ class SaveFileManager
   // A cleanup helper that runs on the file thread.
   void OnShutdown();
 
-  // Called only on UI thread to get the SavePackage for a tab's profile.
+  // Called only on UI thread to get the SavePackage for a tab's browser
+  // context.
   static SavePackage* GetSavePackageFromRenderIds(int render_process_id,
                                                   int review_view_id);
 
@@ -176,8 +177,8 @@ class SaveFileManager
 
   // Notifications sent from the file thread and run on the UI thread.
 
-  // Lookup the SaveManager for this TabContents' saving profile and inform it
-  // the saving job has been started.
+  // Lookup the SaveManager for this TabContents' saving browser context and
+  // inform it the saving job has been started.
   void OnStartSave(const SaveFileCreateInfo* info);
   // Update the SavePackage with the current state of a started saving job.
   // If the SavePackage for this saving job is gone, cancel the request.
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 2e55282..82b4153 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_manager_delegate.h"
 #include "chrome/browser/download/download_util.h"
-#include "chrome/browser/profiles/profile.h"
+#include "content/browser/browser_context.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/download/save_file.h"
diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h
index 53b3f96..76e4b62 100644
--- a/content/browser/download/save_package.h
+++ b/content/browser/download/save_package.h
@@ -24,7 +24,6 @@
 class GURL;
 class MessageLoop;
 class PrefService;
-class Profile;
 class SaveFileManager;
 class SaveItem;
 class SavePackage;
diff --git a/content/browser/file_system/file_system_dispatcher_host.cc b/content/browser/file_system/file_system_dispatcher_host.cc
index 15f74ac..a66e9f8 100644
--- a/content/browser/file_system/file_system_dispatcher_host.cc
+++ b/content/browser/file_system/file_system_dispatcher_host.cc
@@ -11,7 +11,6 @@
 #include "base/platform_file.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/resource_context.h"
 #include "content/common/file_system_messages.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/browser/file_system/file_system_dispatcher_host.h b/content/browser/file_system/file_system_dispatcher_host.h
index d510857..80426aa 100644
--- a/content/browser/file_system/file_system_dispatcher_host.h
+++ b/content/browser/file_system/file_system_dispatcher_host.h
@@ -13,7 +13,6 @@
 #include "webkit/fileapi/file_system_types.h"
 
 class GURL;
-class Profile;
 class Receiver;
 class RenderMessageFilter;
 
diff --git a/content/browser/geolocation/location_arbitrator.cc b/content/browser/geolocation/location_arbitrator.cc
index a5c8e2c..01c2e93 100644
--- a/content/browser/geolocation/location_arbitrator.cc
+++ b/content/browser/geolocation/location_arbitrator.cc
@@ -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,7 +6,6 @@
 
 #include <map>
 
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/geolocation/arbitrator_dependency_factory.h"
 
 namespace {
diff --git a/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h
index 6f6b06d..fd17c77 100644
--- a/content/browser/host_zoom_map.h
+++ b/content/browser/host_zoom_map.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Maps hostnames to custom zoom levels.  Written on the UI thread and read on
-// any thread.  One instance per profile.
+// any thread.  One instance per browser context.
 
 #ifndef CONTENT_BROWSER_HOST_ZOOM_MAP_H_
 #define CONTENT_BROWSER_HOST_ZOOM_MAP_H_
diff --git a/content/browser/in_process_webkit/dom_storage_context.h b/content/browser/in_process_webkit/dom_storage_context.h
index 2d3c667..4b5e639 100644
--- a/content/browser/in_process_webkit/dom_storage_context.h
+++ b/content/browser/in_process_webkit/dom_storage_context.h
@@ -24,10 +24,10 @@ class SpecialStoragePolicy;
 }
 
 // This is owned by WebKitContext and is all the dom storage information that's
-// shared by all the DOMStorageMessageFilters that share the same profile.  The
-// specifics of responsibilities are fairly well documented here and in
-// StorageNamespace and StorageArea.  Everything is only to be accessed on the
-// WebKit thread unless noted otherwise.
+// shared by all the DOMStorageMessageFilters that share the same browser
+// context.  The specifics of responsibilities are fairly well documented here
+// and in StorageNamespace and StorageArea.  Everything is only to be accessed
+// on the WebKit thread unless noted otherwise.
 //
 // NOTE: Virtual methods facilitate mocking functions for testing.
 class DOMStorageContext {
@@ -136,7 +136,7 @@ class DOMStorageContext {
   // True if the destructor should delete its files.
   bool clear_local_state_on_exit_;
 
-  // Path where the profile data is stored.
+  // Path where the browser context data is stored.
   // TODO(pastarmovj): Keep in mind that unlike indexed db data_path_ variable
   // this one still has to point to the upper level dir because of the
   // MigrateLocalStorageDirectory function. Once this function disappears we can
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
index 9ac9034..315a2a7 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.h
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
@@ -80,7 +80,7 @@ class DOMStorageMessageFilter : public BrowserMessageFilter {
   static DOMStorageMessageFilter* storage_event_message_filter;
   static const GURL* storage_event_url_;
 
-  // Data shared between renderer processes with the same profile.
+  // Data shared between renderer processes with the same browser context.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // Used to dispatch messages to the correct view host.
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 85b97b8..dd0737d 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -14,7 +14,6 @@
 
 class IndexedDBKey;
 class NullableString16;
-class Profile;
 class SerializedScriptValue;
 struct IndexedDBHostMsg_DatabaseCreateObjectStore_Params;
 struct IndexedDBHostMsg_FactoryDeleteDatabase_Params;
@@ -263,7 +262,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
     WebIDBTransactionIDToSizeMap transaction_size_map_;
   };
 
-  // Data shared between renderer processes with the same profile.
+  // Data shared between renderer processes with the same browser context.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // Only access on WebKit thread.
diff --git a/content/browser/in_process_webkit/webkit_context.h b/content/browser/in_process_webkit/webkit_context.h
index fa2d32d..6992d77 100644
--- a/content/browser/in_process_webkit/webkit_context.h
+++ b/content/browser/in_process_webkit/webkit_context.h
@@ -24,10 +24,10 @@ class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
-// There's one WebKitContext per profile.  Various DispatcherHost classes
-// have a pointer to the Context to store shared state.  Unfortunately, this
-// class has become a bit of a dumping ground for calls made on the UI thread
-// that need to be proxied over to the WebKit thread.
+// There's one WebKitContext per browser context.  Various DispatcherHost
+// classes have a pointer to the Context to store shared state.  Unfortunately,
+// this class has become a bit of a dumping ground for calls made on the UI
+// thread that need to be proxied over to the WebKit thread.
 //
 // This class is created on the UI thread and accessed on the UI, IO, and WebKit
 // threads.
@@ -77,7 +77,7 @@ class WebKitContext : public base::RefCountedThreadSafe<WebKitContext> {
   friend class base::RefCountedThreadSafe<WebKitContext>;
   virtual ~WebKitContext();
 
-  // Copies of profile data that can be accessed on any thread.
+  // Copies of browser context data that can be accessed on any thread.
   const FilePath data_path_;
   const bool is_incognito_;
 
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index ad994d7..ffe68ad 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -150,7 +150,7 @@ void DatabaseMessageFilter::OnDatabaseOpenFile(const string16& vfs_file_name,
   string16 database_name;
 
   // When in incognito mode, we want to make sure that all DB files are
-  // removed when the incognito profile goes away, so we add the
+  // removed when the incognito browser context goes away, so we add the
   // SQLITE_OPEN_DELETEONCLOSE flag when opening all files, and keep
   // open handles to them in the database tracker to make sure they're
   // around for as long as needed.
diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h
index 73705d2..fa6acbb 100644
--- a/content/browser/renderer_host/database_message_filter.h
+++ b/content/browser/renderer_host/database_message_filter.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.
 
@@ -75,7 +75,7 @@ class DatabaseMessageFilter
                           IPC::Message* reply_msg,
                           int reschedule_count);
 
-  // The database tracker for the current profile.
+  // The database tracker for the current browser context.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
   // True if and only if this instance was added as an observer
diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc
index 93eac4d..dff7830 100644
--- a/content/browser/renderer_host/render_process_host.cc
+++ b/content/browser/renderer_host/render_process_host.cc
@@ -6,7 +6,6 @@
 
 #include "base/rand_util.h"
 #include "base/sys_info.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/common/child_process_info.h"
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 4d0985d..a2ea20a 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -15,7 +15,7 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/profiles/profile.h"
+#include "content/browser/browser_context.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/content_browser_client.h"
@@ -1283,7 +1283,7 @@ void RenderViewHost::OnDidZoomURL(double zoom_level,
   HostZoomMap* host_zoom_map = process()->browser_context()->GetHostZoomMap();
   if (remember) {
     host_zoom_map->SetZoomLevel(net::GetHostOrSpecFromURL(url), zoom_level);
-    // Notify renderers from this profile.
+    // Notify renderers from this browser context.
     for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
          !i.IsAtEnd(); i.Advance()) {
       RenderProcessHost* render_process_host = i.GetCurrentValue();
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index fc29335..a4f7961 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -5,7 +5,6 @@
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
 
 #include "base/logging.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/socket_stream_host.h"
 #include "content/common/socket_stream.h"
diff --git a/content/browser/resolve_proxy_msg_helper.h b/content/browser/resolve_proxy_msg_helper.h
index 85b3b69..d672a33 100644
--- a/content/browser/resolve_proxy_msg_helper.h
+++ b/content/browser/resolve_proxy_msg_helper.h
@@ -27,8 +27,8 @@
 // This object is expected to live on the IO thread.
 class ResolveProxyMsgHelper : public BrowserMessageFilter {
  public:
-  // If |proxy_service| is NULL, then the main profile's proxy service will
-  // be used.
+  // If |proxy_service| is NULL, then the main browser context's proxy service
+  // will be used.
   explicit ResolveProxyMsgHelper(net::ProxyService* proxy_service);
 
   // Destruction cancels the current outstanding request, and clears the
diff --git a/content/browser/ssl/ssl_policy_backend.cc b/content/browser/ssl/ssl_policy_backend.cc
index 60137cf..ff6cdd3 100644
--- a/content/browser/ssl/ssl_policy_backend.cc
+++ b/content/browser/ssl/ssl_policy_backend.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/ssl/ssl_policy_backend.h"
 
-#include "chrome/browser/profiles/profile.h"
+#include "content/browser/browser_context.h"
 #include "content/browser/ssl/ssl_host_state.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 
diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index 068624b..733e55a 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -26,7 +26,8 @@ class URLRequestContextGetter;
 // the browser <-> worker communication channel. There will be one
 // WorkerProcessHost per worker process.  Currently each worker runs in its own
 // process, but that may change.  However, we do assume (by storing a
-// net::URLRequestContext) that a WorkerProcessHost serves a single Profile.
+// net::URLRequestContext) that a WorkerProcessHost serves a single
+// BrowserContext.
 class WorkerProcessHost : public BrowserChildProcessHost {
  public:
 
diff --git a/content/browser/worker_host/worker_service.cc b/content/browser/worker_host/worker_service.cc
index a5477db..f5ac739 100644
--- a/content/browser/worker_host/worker_service.cc
+++ b/content/browser/worker_host/worker_service.cc
@@ -222,8 +222,8 @@ void WorkerService::DocumentDetached(unsigned long long document_id,
 bool WorkerService::CreateWorkerFromInstance(
     WorkerProcessHost::WorkerInstance instance) {
   // TODO(michaeln): We need to ensure that a process is working
-  // on behalf of a single profile. The process sharing logic below
-  // does not ensure that. Consider making WorkerService a per profile
+  // on behalf of a single browser context. The process sharing logic below
+  // does not ensure that. Consider making WorkerService a per browser context
   // object to help with this.
   WorkerProcessHost* worker = NULL;
   if (CommandLine::ForCurrentProcess()->HasSwitch(