Webview tag creation should be using storage partitions.

content/browser/storage_partition_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/storage_partition_impl.h"
 
+#include "base/utf_string_conversions.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace content {
 
 namespace {
@@ skipping 15 matching lines @@
 const FilePath::CharType kStoragePartitionDirname[] =
     FILE_PATH_LITERAL("Storage");
 const FilePath::CharType kExtensionsDirname[] =
     FILE_PATH_LITERAL("ext");
 const FilePath::CharType kDefaultPartitionDirname[] =
     FILE_PATH_LITERAL("def");
 
 }  // namespace
 
 // static
-FilePath StoragePartition::GetPartitionPath(const std::string& partition_id) {
-  if (partition_id.empty()) {
-    // The default profile just sits inside the top-level profile directory.
+FilePath StoragePartitionImpl::GetStoragePartitionPath(
+    const StoragePartitionDescriptor& descriptor) {
+  if (descriptor.partition_domain.empty())
     return FilePath();
+
+#if defined(OS_POSIX)
+  FilePath::StringType domain = descriptor.partition_domain;

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

Do we know if partition_domain, etc., are UTF-8?  (Hopefully we can guarantee
this).  If so, what about just doing .Append(FilePath::FromUTF8Unsafe(domain))
below and dropping the #defines?

The #defines are kinda semantically wrong anyways since what we should be keying
off of is whether or not StringType is wchar_t.  Thus, it's nicer if we can hide
behind an abstraction layer rather than fork the type switching logic.

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

Yes, the partition_domain is even ASCII, since it is the id for the
app/extension. The partition_name is UTF-8. I've added CHECK in the embedder to
enforce this.

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

Do we have a check that enforces ascii and is it important to keep it that
strict?  If not, I'd stick with UTF-8 so the string encodings are uniform across
the different arguments.

+  FilePath::StringType name = descriptor.partition_name;
+#elif defined(OS_WIN)
+  FilePath::StringType domain = UTF8ToUTF16(descriptor.partition_domain);
+  FilePath::StringType name = UTF8ToUTF16(descriptor.partition_name);
+#endif  // OS_WIN
+
+  FilePath path = FilePath(kStoragePartitionDirname).Append(kExtensionsDirname)
+      .Append(domain);
+  if (!name.empty()) {
+    return path.Append(name);
+  } else {
+    return path.Append(kDefaultPartitionDirname);

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

Drop this out of the else {} clause and remove the NOTREACHED().

The return on condition, and fall through to default is the more common paradigm
in chrome.

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

Done.

   }
 
-  // TODO(ajwong): This should check that we create a valid path name.
-  CHECK(IsStringASCII(partition_id));
-  return FilePath(kStoragePartitionDirname)
-      .Append(kExtensionsDirname)
-      .AppendASCII(partition_id)
-      .Append(kDefaultPartitionDirname);
+  NOTREACHED();
+  return FilePath();
 }
 
 StoragePartitionImpl::StoragePartitionImpl(
     const FilePath& partition_path,
     quota::QuotaManager* quota_manager,
     ChromeAppCacheService* appcache_service,
     fileapi::FileSystemContext* filesystem_context,
     webkit_database::DatabaseTracker* database_tracker,
     DOMStorageContextImpl* dom_storage_context,
     IndexedDBContextImpl* indexed_db_context)
@@ skipping 17 matching lines @@
   }
 
   if (GetDOMStorageContext())
     GetDOMStorageContext()->Shutdown();
 }
 
 // TODO(ajwong): Break the direct dependency on |context|. We only
 // need 3 pieces of info from it.
 StoragePartitionImpl* StoragePartitionImpl::Create(
     BrowserContext* context,
-    const std::string& partition_id,
+    const StoragePartitionDescriptor& partition_descriptor,
     const FilePath& profile_path) {
   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          !BrowserThread::IsMessageLoopValid(BrowserThread::UI));
 
   FilePath partition_path =
-      profile_path.Append(GetPartitionPath(partition_id));
+      profile_path.Append(GetStoragePartitionPath(partition_descriptor));
 
   // All of the clients have to be created and registered with the
   // QuotaManager prior to the QuotaManger being used. We do them
   // all together here prior to handing out a reference to anything
   // that utilizes the QuotaManager.
   scoped_refptr<quota::QuotaManager> quota_manager =
       new quota::QuotaManager(
-          context->IsOffTheRecord(), partition_path,
+          partition_descriptor.in_memory, partition_path,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
           context->GetSpecialStoragePolicy());
 
   // Each consumer is responsible for registering its QuotaClient during
   // its construction.
   scoped_refptr<fileapi::FileSystemContext> filesystem_context =
-      CreateFileSystemContext(partition_path, context->IsOffTheRecord(),
+      CreateFileSystemContext(partition_path, partition_descriptor.in_memory,
                               context->GetSpecialStoragePolicy(),
                               quota_manager->proxy());
 
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker =
       new webkit_database::DatabaseTracker(
-          partition_path, context->IsOffTheRecord(),
+          partition_path, partition_descriptor.in_memory,
           context->GetSpecialStoragePolicy(), quota_manager->proxy(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
 
-  FilePath path = context->IsOffTheRecord() ? FilePath() : partition_path;
+  FilePath path = partition_descriptor.in_memory ? FilePath() : partition_path;
   scoped_refptr<DOMStorageContextImpl> dom_storage_context =
       new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy());
 
   scoped_refptr<IndexedDBContextImpl> indexed_db_context =
       new IndexedDBContextImpl(path, context->GetSpecialStoragePolicy(),
                                quota_manager->proxy(),
                                BrowserThread::GetMessageLoopProxyForThread(
                                    BrowserThread::WEBKIT_DEPRECATED));
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
@@ skipping 49 matching lines @@
     net::URLRequestContextGetter* url_request_context) {
   url_request_context_ = url_request_context;
 }
 
 void StoragePartitionImpl::SetMediaURLRequestContext(
     net::URLRequestContextGetter* media_url_request_context) {
   media_url_request_context_ = media_url_request_context;
 }
 
 }  // namespace content