Initial support for partitioning cookies for isolated apps.

chrome/browser/profiles/profile.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 "chrome/browser/profiles/profile.h"
 
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "grit/browser_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/transport_security_state.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(TOOLKIT_USES_GTK)
@@ skipping 104 matching lines @@
         new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
   }
 
   virtual ~OffTheRecordProfileImpl() {
     NotificationService::current()->Notify(NotificationType::PROFILE_DESTROYED,
                                            Source<Profile>(this),
                                            NotificationService::NoDetails());
     CleanupRequestContext(request_context_);
     CleanupRequestContext(extensions_request_context_);
 
+    // Clean up all isolated app request contexts.
+    for (ChromeURLRequestContextGetterMap::iterator iter =
+            app_request_context_map_.begin();

[willchan no longer on Chromium, 2011/01/26 23:21:52]

Looks like you're missing a horizontal whitespace in 162-164, they should line
up with ChromeURLRequestContextGetterMap in the previous line, or be indented
from it.

[Charlie Reis, 2011/03/01 21:33:11]

Done.

+        iter != app_request_context_map_.end();
+        iter++) {

[willchan no longer on Chromium, 2011/01/26 23:21:52]

http://www.corp.google.com/eng/doc/cppguide.xml?external=y&showone=Preincreme...

Use preincrement here.

[Charlie Reis, 2011/03/01 21:33:11]

Done.

+      CleanupRequestContext(iter->second);
+    }
+
     // Clean up all DB files/directories
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             db_tracker_.get(),
             &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory));
 
     BrowserList::RemoveObserver(this);
   }
 
@@ skipping 204 matching lines @@
   }
 
   virtual BrowserThemeProvider* GetThemeProvider() {
     return profile_->GetThemeProvider();
   }
 
   virtual URLRequestContextGetter* GetRequestContext() {
     return request_context_;
   }
 
+  virtual URLRequestContextGetter* GetRequestContext(const Extension* app) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableExperimentalAppManifests)
+      && app != NULL

[willchan no longer on Chromium, 2011/01/26 23:21:52]

Put the && on the previous line as stated in
http://dev.chromium.org/developers/coding-style#Code_Formatting: "When
expressions are wrapped, the operator should be on the end of the broken line,
not the start of the new line."
Indent the newline from the '('

[Charlie Reis, 2011/03/01 21:33:11]

Done.

+      && app->is_storage_isolated())
+      return GetRequestContextForIsolatedApp(app);
+
+    return GetRequestContext();
+  }
+
   virtual URLRequestContextGetter* GetRequestContextForMedia() {
     // In OTR mode, media request context is the same as the original one.
     return request_context_;
   }
 
   URLRequestContextGetter* GetRequestContextForExtensions() {
     if (!extensions_request_context_) {
       extensions_request_context_ =
           ChromeURLRequestContextGetter::CreateOffTheRecordForExtensions(this);
     }
 
     return extensions_request_context_;
   }
 
+  URLRequestContextGetter* GetRequestContextForIsolatedApp(
+      const Extension* installed_app) {
+    CHECK(installed_app);
+    std::string id = installed_app->id();
+
+    // Keep a map of request contexts, one per requested app ID.  Once created,
+    // the context will exist for the lifetime of the profile.
+    ChromeURLRequestContextGetterMap::iterator iter =
+        app_request_context_map_.find(id);
+    if (iter != app_request_context_map_.end())
+      return iter->second;
+
+    ChromeURLRequestContextGetter* context =
+        ChromeURLRequestContextGetter::CreateOffTheRecordForIsolatedApp(this,

[willchan no longer on Chromium, 2011/01/26 23:21:52]

http://www.corp.google.com/eng/doc/cppguide.xml?external=y&showone=Function_C...
says that function calls across multiple lines should have the first argument in
each line aligned.

[Charlie Reis, 2011/03/01 21:33:11]

Done.

+            installed_app);
+    app_request_context_map_[id] = context;
+
+    return context;
+  }
+
   virtual net::SSLConfigService* GetSSLConfigService() {
     return profile_->GetSSLConfigService();
   }
 
   virtual HostContentSettingsMap* GetHostContentSettingsMap() {
     // Retrieve the host content settings map of the parent profile in order to
     // ensure the preferences have been migrated.
     profile_->GetHostContentSettingsMap();
     if (!host_content_settings_map_.get())
       host_content_settings_map_ = new HostContentSettingsMap(this);
@@ skipping 223 matching lines @@
   Profile* profile_;
 
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   // The context to use for requests made from this OTR session.
   scoped_refptr<ChromeURLRequestContextGetter> request_context_;
 
   // The context to use for requests made by an extension while in OTR mode.
   scoped_refptr<ChromeURLRequestContextGetter> extensions_request_context_;
 
+  // A map of request contexts, one per isolated app while in OTR mode.
+  typedef base::hash_map<std::string,

[willchan no longer on Chromium, 2011/01/26 23:21:52]

http://www.corp.google.com/eng/doc/cppguide.xml?external=y&showone=Declaratio...
says typedefs go at the beginning of the section.

[Charlie Reis, 2011/03/01 21:33:11]

Done.

+                         scoped_refptr<ChromeURLRequestContextGetter> >
+      ChromeURLRequestContextGetterMap;
+  ChromeURLRequestContextGetterMap app_request_context_map_;
+
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
   // Use a separate desktop notification service for OTR.
   scoped_ptr<DesktopNotificationService> desktop_notification_service_;
 
   // We use a non-writable content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   // Use a separate zoom map for OTR.
@@ skipping 33 matching lines @@
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 Profile* Profile::CreateOffTheRecordProfile() {
   return new OffTheRecordProfileImpl(this);
 }