all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject

refs #29
diff --git a/disabled/ndn-encoding-helper.cc b/disabled/ndn-encoding-helper.cc
index 8ef3a7a..644ef7b 100644
--- a/disabled/ndn-encoding-helper.cc
+++ b/disabled/ndn-encoding-helper.cc
@@ -31,7 +31,7 @@
 namespace ndn {
 
 size_t
-EncodingHelper::Serialize (Buffer::Iterator start, const InterestHeader &interest)
+EncodingHelper::Serialize (Buffer::Iterator start, const Interest &interest)
 {
   size_t written = 0;
   written += AppendBlockHeader (start, CcnbParser::CCN_DTAG_Interest, CcnbParser::CCN_DTAG); // <Interest>
@@ -100,7 +100,7 @@
 }
 
 size_t
-EncodingHelper::GetSerializedSize (const InterestHeader &interest)
+EncodingHelper::GetSerializedSize (const Interest &interest)
 {
   size_t written = 0;
   written += EstimateBlockHeader (CcnbParser::CCN_DTAG_Interest); // <Interest>