all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject

refs #29
diff --git a/disabled/ndn-decoding-helper.cc b/disabled/ndn-decoding-helper.cc
index 89936c1..3984540 100644
--- a/disabled/ndn-decoding-helper.cc
+++ b/disabled/ndn-decoding-helper.cc
@@ -35,7 +35,7 @@
 namespace ndn {
 
 size_t
-DecodingHelper::Deserialize (Buffer::Iterator start, InterestHeader &interest)
+DecodingHelper::Deserialize (Buffer::Iterator start, Interest &interest)
 {
   static CcnbParser::InterestVisitor interestVisitor;
 
@@ -47,7 +47,7 @@
 }
 
 // size_t
-// NdnDecodingHelper::Deserialize (Buffer::Iterator start, NdnContentObjectHeader &contentObject)
+// NdnDecodingHelper::Deserialize (Buffer::Iterator start, NdnContentObject &contentObject)
 // {
 //   static CcnbParser::ContentObjectVisitor contentObjectVisitor;