Cleanup deprecated and no longer needed blob revamp stuff, deadcode.

content/common/page_state_serialization.cc

 // Copyright 2013 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 "content/common/page_state_serialization.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/pickle.h"
@@ skipping 40 matching lines @@
                               double file_modification_time) {
   ExplodedHttpBodyElement element;
   element.type = WebKit::WebHTTPBody::Element::TypeFileSystemURL;
   element.filesystem_url = url;
   element.file_start = file_start;
   element.file_length = file_length;
   element.file_modification_time = file_modification_time;
   http_body->elements.push_back(element);
 }
 
-#ifdef USE_BLOB_UUIDS
 void AppendBlobToHttpBody(ExplodedHttpBody* http_body,
                           const std::string& uuid) {
   ExplodedHttpBodyElement element;
   element.type = WebKit::WebHTTPBody::Element::TypeBlob;
   element.blob_uuid = uuid;
   http_body->elements.push_back(element);
 }
-#else
-void DeprecatedAppendBlobToHttpBody(ExplodedHttpBody* http_body,
-                                    const GURL& url) {
-  ExplodedHttpBodyElement element;
-  element.type = WebKit::WebHTTPBody::Element::TypeBlob;
-  element.deprecated_blob_url = url;
-  http_body->elements.push_back(element);
-}
-#endif
 
 //----------------------------------------------------------------------------
 
 void AppendReferencedFilesFromHttpBody(
     const std::vector<ExplodedHttpBodyElement>& elements,
     std::vector<base::NullableString16>* referenced_files) {
   for (size_t i = 0; i < elements.size(); ++i) {
     if (elements[i].type == WebKit::WebHTTPBody::Element::TypeFile)
       referenced_files->push_back(elements[i].file_path);
   }
@@ skipping 107 matching lines @@
 // 12: Adds support for contains_passwords in HTTP body
 // 13: Adds support for URL (FileSystem URL)
 // 14: Adds list of referenced files, version written only for first item.
 // 15: Removes a bunch of values we defined but never used.
 // 16: Switched from blob urls to blob uuids.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See ReadPageState.
 //
 const int kMinVersion = 11;
-#ifdef USE_BLOB_UUIDS
-// This is not used yet, if a version bump is needed in advance of
-// this becoming used, bump both values by one and fixup the comment
-// and change the test for '16' in ReadHttpBody().
-// -- michaeln
 const int kCurrentVersion = 16;
-#else
-const int kCurrentVersion = 15;
-#endif
 
 // A bunch of convenience functions to read/write to SerializeObjects.  The
 // de-serializers assume the input data will be in the correct format and fall
 // back to returning safe defaults when not.
 
 void WriteData(const void* data, int length, SerializeObject* obj) {
   obj->pickle.WriteData(static_cast<const char*>(data), length);
 }
 
 void ReadData(SerializeObject* obj, const void** data, int* length) {
@@ skipping 213 matching lines @@
       WriteInteger64(element.file_length, obj);
       WriteReal(element.file_modification_time, obj);
     } else if (element.type ==
                WebKit::WebHTTPBody::Element::TypeFileSystemURL) {
       WriteGURL(element.filesystem_url, obj);
       WriteInteger64(element.file_start, obj);
       WriteInteger64(element.file_length, obj);
       WriteReal(element.file_modification_time, obj);
     } else {
       DCHECK(element.type == WebKit::WebHTTPBody::Element::TypeBlob);
-#ifdef USE_BLOB_UUIDS
       WriteStdString(element.blob_uuid, obj);
-#else
-      WriteGURL(element.deprecated_blob_url, obj);
-#endif
     }
   }
   WriteInteger64(http_body.identifier, obj);
   WriteBoolean(http_body.contains_passwords, obj);
 }
 
 void ReadHttpBody(SerializeObject* obj, ExplodedHttpBody* http_body) {
   // An initial boolean indicates if we have an HTTP body.
   if (!ReadBoolean(obj))
     return;
@@ skipping 19 matching lines @@
       AppendFileRangeToHttpBody(http_body, file_path, file_start, file_length,
                                 file_modification_time);
     } else if (type == WebKit::WebHTTPBody::Element::TypeFileSystemURL) {
       GURL url = ReadGURL(obj);
       int64 file_start = ReadInteger64(obj);
       int64 file_length = ReadInteger64(obj);
       double file_modification_time = ReadReal(obj);
       AppendURLRangeToHttpBody(http_body, url, file_start, file_length,
                                file_modification_time);
     } else if (type == WebKit::WebHTTPBody::Element::TypeBlob) {
-#ifdef USE_BLOB_UUIDS
       if (obj->version >= 16) {
         std::string blob_uuid = ReadStdString(obj);
         AppendBlobToHttpBody(http_body, blob_uuid);
       } else {
         ReadGURL(obj); // Skip the obsolete blob url value.
       }
-#else
-      GURL blob_url = ReadGURL(obj);
-      DeprecatedAppendBlobToHttpBody(http_body, blob_url);
-#endif
     }
   }
   http_body->identifier = ReadInteger64(obj);
 
   if (obj->version >= 12)
     http_body->contains_passwords = ReadBoolean(obj);
 }
 
 // Writes the ExplodedFrameState data into the SerializeObject object for
 // serialization.
@@ skipping 212 matching lines @@
     float device_scale_factor,
     ExplodedPageState* exploded) {
   g_device_scale_factor_for_testing = device_scale_factor;
   bool rv = DecodePageState(encoded, exploded);
   g_device_scale_factor_for_testing = 0.0;
   return rv;
 }
 #endif
 
 }  // namespace content