Revert 141680 - Adds parsing for the app_id field from an "open-with-" link

chrome/browser/chromeos/gdata/gdata_parser.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/gdata/gdata_parser.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/json/json_value_converter.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 106 matching lines @@
 const char kHrefAttr[] = "href";
 const char kLabelAttr[] = "label";
 const char kNameAttr[] = "name";
 const char kRelAttr[] = "rel";
 const char kSchemeAttr[] = "scheme";
 const char kSrcAttr[] = "src";
 const char kTermAttr[] = "term";
 const char kTypeAttr[] = "type";
 const char kValueAttr[] = "value";
 
-// Link Prefixes
-const char kOpenWithPrefix[] = "http://schemas.google.com/docs/2007#open-with-";
-const size_t kOpenWithPrefixSize = arraysize(kOpenWithPrefix) - 1;
-
 struct EntryKindMap {
   DocumentEntry::EntryKind kind;
   const char* entry;
   const char* extension;
 };
 
 const EntryKindMap kEntryKindMap[] = {
     { DocumentEntry::ITEM,         "item",         NULL},
     { DocumentEntry::DOCUMENT,     "document",     ".gdoc"},
     { DocumentEntry::SPREADSHEET,  "spreadsheet",  ".gsheet"},
@@ skipping 132 matching lines @@
   } while (depth == xml_reader->Depth() && (skip_read || xml_reader->Next()));
   return author;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Link implementation
 
 Link::Link() : type_(Link::UNKNOWN) {
 }
 
-// static
-bool Link::GetAppID(const base::StringPiece& rel, std::string* app_id) {
-  DCHECK(app_id);
-  // Fast return path if the link clearly isn't an OPEN_WITH link.
-  if (rel.size() < kOpenWithPrefixSize) {
-    app_id->clear();
-    return true;
-  }
-
-  const std::string kOpenWithPrefixStr(kOpenWithPrefix);
-  if (StartsWithASCII(rel.as_string(), kOpenWithPrefixStr, false)) {
-   *app_id = rel.as_string().substr(kOpenWithPrefixStr.size());
-   return true;
-  }
-
-  app_id->clear();
-  return true;
-}
-
 // static.
-bool Link::GetLinkType(const base::StringPiece& rel, Link::LinkType* type) {
-  DCHECK(type);
+bool Link::GetLinkType(const base::StringPiece& rel, Link::LinkType* result) {
   for (size_t i = 0; i < arraysize(kLinkTypeMap); i++) {
     if (rel == kLinkTypeMap[i].rel) {
-      *type = kLinkTypeMap[i].type;
+      *result = kLinkTypeMap[i].type;
       return true;
     }
   }
-
-  // OPEN_WITH links have extra information at the end of the rel that is unique
-  // for each one, so we can't just check the usual map. This check is slightly
-  // redundant to provide a quick skip if it's obviously not an OPEN_WITH url.
-  if (rel.size() >= kOpenWithPrefixSize &&
-      StartsWithASCII(rel.as_string(), kOpenWithPrefix, false)) {
-    *type = OPEN_WITH;
-    return true;
-  }
-
   // Let unknown link types through, just report it; if the link type is needed
   // in the future, add it into LinkType and kLinkTypeMap.
   DVLOG(1) << "Ignoring unknown link type for rel " << rel;
-  *type = UNKNOWN;
+  *result = UNKNOWN;
   return true;
 }
 
 // static
 void Link::RegisterJSONConverter(base::JSONValueConverter<Link>* converter) {
-  converter->RegisterCustomField<Link::LinkType>(kRelField,
-                                                 &Link::type_,
-                                                 &Link::GetLinkType);
-  // We have to register kRelField twice because we extract two different pieces
-  // of data from the same rel field.
-  converter->RegisterCustomField<std::string>(kRelField,
-                                              &Link::app_id_,
-                                              &Link::GetAppID);
+  converter->RegisterCustomField<Link::LinkType>(
+      kRelField, &Link::type_, &Link::GetLinkType);
   converter->RegisterCustomField(kHrefField, &Link::href_, &GetGURLFromString);
   converter->RegisterStringField(kTitleField, &Link::title_);
   converter->RegisterStringField(kTypeField, &Link::mime_type_);
 }
 
 // static.
 Link* Link::CreateFromXml(XmlReader* xml_reader) {
   if (xml_reader->NodeName() != kLinkNode)
     return NULL;
 
   Link* link = new Link();
   xml_reader->NodeAttribute(kTypeAttr, &link->mime_type_);
 
   std::string href;
   if (xml_reader->NodeAttribute(kHrefAttr, &href))
       link->href_ = GURL(href);
 
   std::string rel;
-  if (xml_reader->NodeAttribute(kRelAttr, &rel)) {
+  if (xml_reader->NodeAttribute(kRelAttr, &rel))
     GetLinkType(rel, &link->type_);
-    if (link->type_ == OPEN_WITH)
-      GetAppID(rel, &link->app_id_);
-  }
 
   return link;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FeedLink implementation
 
 FeedLink::FeedLink() : type_(FeedLink::UNKNOWN) {
 }
 
@@ skipping 578 matching lines @@
 bool AccountMetadataFeed::Parse(const base::Value& value) {
   base::JSONValueConverter<AccountMetadataFeed> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid account metadata feed!";
     return false;
   }
   return true;
 }
 
 }  // namespace gdata