Added the ability in the service process to save and read state from a prefs file. Used this to save and read the cloud print proxy auth token and proxy id.

BUG=None.
TEST=Test Cloud Print Proxy (run it second time without LSID and ProxyId command-line args)

Review URL: http://codereview.chromium.org/2066018

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

4 files changed, 16 insertions, 5 deletions

diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 47745f4..2250cf5 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -111,6 +111,7 @@ const FilePath::CharType kCustomDictionaryFileName[] =
 const FilePath::CharType kLoginDataFileName[] = FPL("Login Data");
 const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
 const FilePath::CharType kWebAppDirname[] = FPL("Web Applications");
+const FilePath::CharType kServiceStateFileName[] = FPL("Service State");
 
 // This number used to be limited to 32 in the past (see b/535234).
 const unsigned int kMaxRendererProcessCount = 42;
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 604f351..4090b74 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -63,6 +63,7 @@ extern const FilePath::CharType kCustomDictionaryFileName[];
 extern const FilePath::CharType kLoginDataFileName[];
 extern const FilePath::CharType kJumpListIconDirname[];
 extern const FilePath::CharType kWebAppDirname[];
+extern const FilePath::CharType kServiceStateFileName[];
 
 extern const unsigned int kMaxRendererProcessCount;
 extern const int kStatsMaxThreads;
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 726e8c5..4bb20c0 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -794,10 +794,18 @@ const wchar_t kLoginDatabaseMigrated[] = L"login_database.migrated";
 
 // The root URL of the cloud print service.
 const wchar_t kCloudPrintServiceURL[] = L"cloud_print.service_url";
+
+// *************** SERVICE PREFS ***************
+// These are attached to the service process.
+
 // The unique id for this instance of the cloud print proxy.
 const wchar_t kCloudPrintProxyId[] = L"cloud_print.proxy_id";
-// The human-readable name of the Cloud Print proxy. User-supplied.
-const wchar_t kCloudPrintProxyName[] = L"cloud_print.proxy_name";
-// The GAIA auth token (we may need to move it outside of prefs)
-const wchar_t kCloudPrintAuthToken[] = L"cloud_print_auth_token";
+// The GAIA auth token for Cloud Print
+const wchar_t kCloudPrintAuthToken[] = L"cloud_print.auth_token";
+// The GAIA auth token used by Cloud Print to authenticate with the XMPP server
+// This should eventually go away because the above token should work for both.
+const wchar_t kCloudPrintXMPPAuthToken[] = L"cloud_print.xmpp_auth_token";
+// The email address of the account used to authenticate with the Cloud Print
+// server.
+extern const wchar_t kCloudPrintEmail[] = L"cloud_print.email";
 }  // namespace prefs
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index fcf575a..4b17742 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -296,8 +296,9 @@ extern const wchar_t kLoginDatabaseMigrated[];
 
 extern const wchar_t kCloudPrintServiceURL[];
 extern const wchar_t kCloudPrintProxyId[];
-extern const wchar_t kCloudPrintProxyName[];
 extern const wchar_t kCloudPrintAuthToken[];
+extern const wchar_t kCloudPrintXMPPAuthToken[];
+extern const wchar_t kCloudPrintEmail[];
 
 }  // namespace prefs