Redo the Storage Partition directory layout to support guest tags and origin based partitions.

content/public/common/content_constants.h

Index: content/public/common/content_constants.h
diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h
index 369c4c160a42c2e5ceb1a6a7674520e5d1888bb7..12bd7dcca00b19319a4e0dbf0b81d462933d839a 100644
--- a/content/public/common/content_constants.h
+++ b/content/public/common/content_constants.h
@@ -20,11 +20,6 @@ CONTENT_EXPORT extern const FilePath::CharType kAppCacheDirname[];
 // The name of the directory under BrowserContext::GetPath where Pepper plugin
 // data is put.
 CONTENT_EXPORT extern const FilePath::CharType kPepperDataDirname[];
-// The name of the directory under BrowserContext::GetPath() where renderers
-// with a non-default storage partition keep their persistent state. This will
-// contain a set of directories that partially mirror the directory structure
-// of BrowserContext::GetPath().
-CONTENT_EXPORT extern const FilePath::CharType kStoragePartitionDirname[];
 
 // The MIME type used for the browser plugin.
 CONTENT_EXPORT extern const char kBrowserPluginMimeType[];