Change the underlying directory for Isolated Apps to be the same as Storage Partitions.

This is staging for moving URLRequestContext into StoragePartition.

BUG=85121


Review URL: https://chromiumcodereview.appspot.com/10896013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153838 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 4 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[];