Commit e64a0abc authored by rsimha@google.com's avatar rsimha@google.com

Revert 151169 - [sync] Enable sync credential caching by default for post-M22 builds

Reason for revert: See bug 143214. CredentialCacheService::GetLastUpdatedTime() is causing a crash in canary builds during upgrade scenarios from older versions. A real fix for the root cause is under review. The earlier revert in https://chromiumcodereview.appspot.com/10830362 is unlikely to fix the root cause. Until then, the safe thing to do is to disable the feature, by reverting r151169.

Original CL description:

Sync credential caching is a Win 8 feature that allows Metro and Desktop
to share sync credentials under some circumstances. The feature is
slated to ship with M23, and was disabled for the M22 branch point.
Now that M22 has been branched off, it is time to re-enable the feature.

This patch turns on the feature by default, and provides users with the
"--disable-sync-credential-caching" flag if the feature must be disabled.

BUG=139712,143214
TEST=Sign in on Win 8 and make sure that "Sync Credentials" is written to the default profile directory
Old review URL: https://chromiumcodereview.appspot.com/10855063

TBR=tim@chromium.org,zea@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10836297

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151976 0039d316-1c4b-4281-b951-d872f2087c98
parent 099752fa
......@@ -61,11 +61,11 @@ bool CredentialCacheServiceFactory::ServiceIsCreatedWithProfile() {
ProfileKeyedService* CredentialCacheServiceFactory::BuildServiceInstanceFor(
Profile* profile) const {
// Only instantiate a CredentialCacheService object if we are running in the
// default profile on Windows 8, and if credential caching is not disabled.
// default profile on Windows 8, and if credential caching is enabled.
const CommandLine* command_line = CommandLine::ForCurrentProcess();
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
IsDefaultProfile(profile) &&
!command_line->HasSwitch(switches::kDisableSyncCredentialCaching)) {
command_line->HasSwitch(switches::kEnableSyncCredentialCaching)) {
return new syncer::CredentialCacheService(profile);
}
return NULL;
......
......@@ -1536,9 +1536,9 @@ const char kUseMockKeychain[] = "use-mock-keychain";
// modification or removal.
const char kDisableDesktopShortcuts[] = "disable-desktop-shortcuts";
// Disables sync credential caching on Windows 8.
// Enables sync credential caching on Windows 8.
// See chrome/browser/sync/credential_cache_service_win.h.
const char kDisableSyncCredentialCaching[] = "disable-sync-credential-caching";
const char kEnableSyncCredentialCaching[] = "enable-sync-credential-caching";
// For the DelegateExecute verb handler to launch Chrome in metro mode on
// Windows 8 and higher. Used when relaunching metro Chrome.
......
......@@ -428,7 +428,7 @@ extern const char kUseMockKeychain[];
#if defined(OS_WIN)
extern const char kDisableDesktopShortcuts[];
extern const char kDisableSyncCredentialCaching[];
extern const char kEnableSyncCredentialCaching[];
extern const char kForceImmersive[];
extern const char kRelaunchShortcut[];
extern const char kWaitForHandle[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment