Revert cls (original cl + fixes) 7422-7424 "Add VP9 codec to VCM..."

BUG=3932
R=marpan@google.com

Review URL: https://webrtc-codereview.appspot.com/27779004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7470 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_coding/main/test/test_util.cc

@@ -151,7 +151,6 @@ webrtc::RtpVideoCodecTypes ConvertCodecType(const char* plname) {
   if (strncmp(plname,"VP8" , 3) == 0) {
     return webrtc::kRtpVideoVp8;
   } else {
-    // Default value.
-    return webrtc::kRtpVideoGeneric;
+    return webrtc::kRtpVideoNone;  // Default value
   }
 }