Webview tag creation should be using storage partitions.

content/browser/storage_partition_impl_map.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/storage_partition_impl_map.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/stl_util.h"
@@ skipping 169 matching lines @@
       new DeveloperProtocolHandler(appcache_service,
                                    blob_storage_context->controller()));
 
   // TODO(jam): Add the ProtocolHandlerRegistryIntercepter here!
 }
 
 }  // namespace
 
 StoragePartitionImplMap::StoragePartitionImplMap(
     BrowserContext* browser_context)
-    : browser_context_(browser_context) {
+    : browser_context_(browser_context),
+      resource_context_initialized_(false) {
 }
 
 StoragePartitionImplMap::~StoragePartitionImplMap() {
   STLDeleteContainerPairSecondPointers(partitions_.begin(),
                                        partitions_.end());
 }
 
 StoragePartitionImpl* StoragePartitionImplMap::Get(
-    const std::string& partition_id) {
+    const std::string& partition_domain,
+    const std::string& partition_name,
+    const bool& in_memory) {
+  if (!resource_context_initialized_) {

[awong, 2012/11/02 21:56:13]

If you're planning on moving out this, add TODO?

[nasko, 2012/11/03 00:36:24]

Meant to keep the original TODO. Thanks for the catch!

+    resource_context_initialized_ = true;
+    InitializeResourceContext(browser_context_);
+  }
+
+  bool in_memory_only = false;

[awong, 2012/11/02 21:56:13]

why not:

bool in_memory_only = in_memory || browser_context->IsOffTheRecord();

?

[nasko, 2012/11/03 00:36:24]

Done.

+  if (in_memory || browser_context_->IsOffTheRecord())
+    in_memory_only = true;
+
+  // TODO(nasko): Webview tags with named partitions will have both
+  // partition_domain and partition_name set. In this case, mark them in-memory
+  // until the on-disk storage code has landed.
+  if (!partition_domain.empty() && !partition_name.empty())

[awong, 2012/11/02 21:56:13]

Maybe move this into the calling function?

That way this function doesn't need to know about parsing the various names.

[nasko, 2012/11/03 00:36:24]

The caller of this is BrowserContext. Since the changes for on-disk storage are
more close to the actual storage partition than BrowserContext, I chose to keep
it here.

[awong, 2012/11/05 18:00:33]

But this way the API is more complicated because the caller has doesn't quite
know whether in_memory will be changed out from under neath it.

I think it's cleaner to move all this in_memory resolution logic out of Get() so
Get() can stick with the simple rule of "whatever its arguments say, it's going
to do" ratehr than causing a behavior switch based on a member variable...

[awong, 2012/11/05 20:11:18]

For instance, doesn't content browser client ultimately own this logic?

[nasko, 2012/11/05 23:06:58]

This is temporary until you fix the on-disk code, so I don't think it makes
really big difference where it lives. I'll move it over to the content client.

+    in_memory_only = true;
+
   // Find the previously created partition if it's available.
-  std::map<std::string, StoragePartitionImpl*>::const_iterator it =
-      partitions_.find(partition_id);
+  StoragePartitionImpl::StoragePartitionDescriptor partition_descriptor(
+      partition_domain, partition_name, in_memory_only);
+
+  PartitionsMap::const_iterator it = partitions_.find(partition_descriptor);
   if (it != partitions_.end())
     return it->second;
 
   // There was no previous partition, so let's make a new one.
   StoragePartitionImpl* partition =
-      StoragePartitionImpl::Create(browser_context_, partition_id,
+      StoragePartitionImpl::Create(browser_context_, partition_descriptor,
                                    browser_context_->GetPath());
-  partitions_[partition_id] = partition;
+  partitions_[partition_descriptor] = partition;
 
   // These calls must happen after StoragePartitionImpl::Create().
   partition->SetURLRequestContext(
-      partition_id.empty() ?
+      partition_domain.empty() ?
       browser_context_->GetRequestContext() :
       browser_context_->GetRequestContextForStoragePartition(
-          partition->GetPath(), false));
+          partition->GetPath(), in_memory_only));
   partition->SetMediaURLRequestContext(
-      partition_id.empty() ?
+      partition_domain.empty() ?
       browser_context_->GetMediaRequestContext() :
       browser_context_->GetMediaRequestContextForStoragePartition(
-          partition->GetPath(), false));
+          partition->GetPath(), in_memory_only));
 
   PostCreateInitialization(partition);
 
-  // TODO(ajwong): ResourceContexts no longer have any storage related state.
-  // We should move this into a place where it is called once per
-  // BrowserContext creation rather than piggybacking off the default context
-  // creation.
-  if (partition_id.empty()) {
-    InitializeResourceContext(browser_context_);
-  }
-
   return partition;
 }
 
 void StoragePartitionImplMap::ForEach(
     const BrowserContext::StoragePartitionCallback& callback) {
-  for (std::map<std::string, StoragePartitionImpl*>::const_iterator it =
-           partitions_.begin();
+  for (PartitionsMap::const_iterator it = partitions_.begin();
        it != partitions_.end();
        ++it) {
-    callback.Run(it->first, it->second);
+    callback.Run(it->second);
   }
 }
 
 void StoragePartitionImplMap::PostCreateInitialization(
     StoragePartitionImpl* partition) {
   // Check first to avoid memory leak in unittests.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
@@ skipping 18 matching lines @@
 
     // We do not call InitializeURLRequestContext() for media contexts because,
     // other than the HTTP cache, the media contexts share the same backing
     // objects as their associated "normal" request context.  Thus, the previous
     // call serves to initialize the media request context for this storage
     // partition as well.
   }
 }
 
 }  // namespace content