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

webkit/common/data_element.h

Index: webkit/common/data_element.h
diff --git a/webkit/common/data_element.h b/webkit/common/data_element.h
index f93960ba1bdf3a7394f7066d377f12dea3c3688c..4ec09cec4e1ae6a1b61c97b657b2dd1949be07c6 100644
--- a/webkit/common/data_element.h
+++ b/webkit/common/data_element.h
@@ -36,12 +36,7 @@ class WEBKIT_COMMON_EXPORT DataElement {
   const char* bytes() const { return bytes_ ? bytes_ : &buf_[0]; }
   const base::FilePath& path() const { return path_; }
   const GURL& filesystem_url() const { return filesystem_url_; }
-
-  // TODO(michaeln): crbug/174200, fully switch to using string uuids.
-  // Note: Identifying blobs by url is being deprecated, but while
-  // transitioning, there's a little of both going on in the project.
   const std::string& blob_uuid() const { return blob_uuid_; }
-  const GURL& blob_url() const { return blob_url_; }
   uint64 offset() const { return offset_; }
   uint64 length() const { return length_; }
   const base::Time& expected_modification_time() const {
@@ -69,9 +64,6 @@ class WEBKIT_COMMON_EXPORT DataElement {
   }
 
   // Sets TYPE_BLOB data.
-  void SetToBlobUrl(const GURL& blob_url) {
-    SetToBlobUrlRange(blob_url, 0, kuint64max);
-  }
   void SetToBlob(const std::string& uuid) {
     SetToBlobRange(uuid, 0, kuint64max);
   }
@@ -82,8 +74,6 @@ class WEBKIT_COMMON_EXPORT DataElement {
                           const base::Time& expected_modification_time);
 
   // Sets TYPE_BLOB data with range.
-  void SetToBlobUrlRange(const GURL& blob_url,
-                         uint64 offset, uint64 length);
   void SetToBlobRange(const std::string& blob_uuid,
                       uint64 offset, uint64 length);
 
@@ -98,7 +88,6 @@ class WEBKIT_COMMON_EXPORT DataElement {
   const char* bytes_;  // For TYPE_BYTES.
   base::FilePath path_;  // For TYPE_FILE.
   GURL filesystem_url_;  // For TYPE_FILE_FILESYSTEM.
-  GURL blob_url_;
   std::string blob_uuid_;
   uint64 offset_;
   uint64 length_;
@@ -118,8 +107,7 @@ inline bool operator==(const DataElement& a, const DataElement& b) {
       return a.path() == b.path() &&
              a.expected_modification_time() == b.expected_modification_time();
     case DataElement::TYPE_BLOB:
-      return a.blob_uuid().empty() ? (a.blob_url() == b.blob_url())
-                                   : (a.blob_uuid() == b.blob_uuid());
+      return a.blob_uuid() == b.blob_uuid();
     case DataElement::TYPE_FILE_FILESYSTEM:
       return a.filesystem_url() == b.filesystem_url();
     case DataElement::TYPE_UNKNOWN: