Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/common/chrome_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 1329 matching lines @@
 const char kSyncInvalidateXmppLogin[]       = "sync-invalidate-xmpp-login";
 
 // Enable support for keystore key based encryption.
 const char kSyncKeystoreEncryption[]        = "sync-keystore-encryption";
 
 // This flag causes sync to retry very quickly (see polling_constants.h) the
 // when it encounters an error, as the first step towards exponential backoff.
 const char kSyncShortInitialRetryOverride[] =
     "sync-short-initial-retry-override";
 
+// Overrides the default notification method for sync.
+const char kSyncNotificationMethod[]        = "sync-notification-method";
+
 // Overrides the default host:port used for sync notifications.
 const char kSyncNotificationHostPort[]      = "sync-notification-host-port";
 
 // Overrides the default server used for profile sync.
 const char kSyncServiceURL[]                = "sync-url";
 
 // Enables syncing of favicons as part of tab sync.
 const char kSyncTabFavicons[]               = "sync-tab-favicons";
 
 // Makes the sync code to throw an unrecoverable error after initialization.
@@ skipping 238 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches