[Sync] Removed unused notification methods, renamed 'transitional' to 'p2p'

BUG=None
TEST=Existing integration tests

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

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

1 files changed, 4 insertions, 14 deletions

diff --git a/jingle/notifier/base/notification_method.cc b/jingle/notifier/base/notification_method.cc
index 08feb4a..6095ed0 100644
--- a/jingle/notifier/base/notification_method.cc
+++ b/jingle/notifier/base/notification_method.cc
@@ -13,14 +13,8 @@ const NotificationMethod kDefaultNotificationMethod = NOTIFICATION_SERVER;
 std::string NotificationMethodToString(
     NotificationMethod notification_method) {
   switch (notification_method) {
-    case NOTIFICATION_LEGACY:
-      return "NOTIFICATION_LEGACY";
-      break;
-    case NOTIFICATION_TRANSITIONAL:
-      return "NOTIFICATION_TRANSITIONAL";
-      break;
-    case NOTIFICATION_NEW:
-      return "NOTIFICATION_NEW";
+    case NOTIFICATION_P2P:
+      return "NOTIFICATION_P2P";
       break;
     case NOTIFICATION_SERVER:
       return "NOTIFICATION_SERVER";
@@ -34,12 +28,8 @@ std::string NotificationMethodToString(
 }
 
 NotificationMethod StringToNotificationMethod(const std::string& str) {
-  if (str == "legacy") {
-    return NOTIFICATION_LEGACY;
-  } else if (str == "transitional") {
-    return NOTIFICATION_TRANSITIONAL;
-  } else if (str == "new") {
-    return NOTIFICATION_NEW;
+  if (str == "p2p") {
+    return NOTIFICATION_P2P;
   } else if (str == "server") {
     return NOTIFICATION_SERVER;
   }