7 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc
index 92d0d3a..409b8df 100644
--- a/chrome/browser/extensions/data_deleter.cc
+++ b/chrome/browser/extensions/data_deleter.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/common/content_constants.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/cookie_monster.h"
@@ -93,7 +94,7 @@ DataDeleter::DataDeleter(
     extension_request_context_ =
         profile->GetRequestContextForIsolatedApp(extension_id);
     isolated_app_path_ = profile->GetPath().
-        Append(chrome::kIsolatedAppStateDirname).AppendASCII(extension_id);
+        Append(content::kStoragePartitionDirname).AppendASCII(extension_id);
   } else {
     extension_request_context_ = profile->GetRequestContext();
   }
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 65be424..7fb21ad 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -86,6 +86,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
+#include "content/public/common/content_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -384,7 +385,7 @@ void ProfileImpl::DoFinalInit(bool is_new_profile) {
   extensions_cookie_path =
       extensions_cookie_path.Append(chrome::kExtensionsCookieFilename);
 
-  FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname);
+  FilePath app_path = GetPath().Append(content::kStoragePartitionDirname);
 
 #if defined(OS_ANDROID)
   SessionStartupPref::Type startup_pref_type =
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index da78180..0435e55 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -139,7 +139,6 @@ const FilePath::CharType kFaviconsFilename[] = FPL("Favicons");
 const FilePath::CharType kHistoryBookmarksFileName[] =
     FPL("Bookmarks From History");
 const FilePath::CharType kHistoryFilename[] = FPL("History");
-const FilePath::CharType kIsolatedAppStateDirname[] = FPL("Isolated Apps");
 const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
 const FilePath::CharType kLocalStateFilename[] = FPL("Local State");
 const FilePath::CharType kLoginDataFileName[] = FPL("Login Data");
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 0042928..70f6ee9 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -65,7 +65,6 @@ extern const FilePath::CharType kExtensionsCookieFilename[];
 extern const FilePath::CharType kFaviconsFilename[];
 extern const FilePath::CharType kHistoryBookmarksFileName[];
 extern const FilePath::CharType kHistoryFilename[];
-extern const FilePath::CharType kIsolatedAppStateDirname[];
 extern const FilePath::CharType kJumpListIconDirname[];
 extern const FilePath::CharType kLocalStateFilename[];
 extern const FilePath::CharType kLoginDataFileName[];
diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc
index 9ea71830..393176a 100644
--- a/content/browser/storage_partition_impl_map.cc
+++ b/content/browser/storage_partition_impl_map.cc
@@ -18,10 +18,6 @@
 
 namespace content {
 
-// Dirname for storing persistent data for renderers with isolated storage.
-const FilePath::CharType kStoragePartitionDirName[] =
-    FILE_PATH_LITERAL("Storage Partitions");
-
 StoragePartitionImplMap::StoragePartitionImplMap(
     BrowserContext* browser_context)
     : browser_context_(browser_context) {
@@ -45,7 +41,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
   if (!partition_id.empty()) {
     // TODO(ajwong): This should check the path is valid?
     CHECK(IsStringASCII(partition_id));
-    partition_path = partition_path.Append(kStoragePartitionDirName)
+    partition_path = partition_path.Append(kStoragePartitionDirname)
         .AppendASCII(partition_id);
   }
 
diff --git a/content/public/common/content_constants.cc b/content/public/common/content_constants.cc
index b8e205f9..9b0cdc4 100644
--- a/content/public/common/content_constants.cc
+++ b/content/public/common/content_constants.cc
@@ -9,6 +9,8 @@ const FilePath::CharType kAppCacheDirname[] =
     FILE_PATH_LITERAL("Application Cache");
 const FilePath::CharType kPepperDataDirname[] =
     FILE_PATH_LITERAL("Pepper Data");
+const FilePath::CharType kStoragePartitionDirname[] =
+    FILE_PATH_LITERAL("Storage Partitions");
 
 const char kBrowserPluginMimeType[] = "application/browser-plugin";
 // TODO(fsamuel): Remove this once upstreaming of the new browser plugin is
diff --git a/content/public/common/content_constants.h b/content/public/common/content_constants.h
index 12bd7dc..369c4c1 100644
--- a/content/public/common/content_constants.h
+++ b/content/public/common/content_constants.h
@@ -20,6 +20,11 @@ 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[];