Switch Safe Browsing's metadata from string to struct.

components/safe_browsing_db/safe_browsing_api_handler_util.h

 // Copyright 2015 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.
 //
 // Helper functions for SafeBrowsingApiHandlerImpl.  Separated out for tests.
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_SAFE_BROWSING_API_HANDLER_UTIL_H_
 #define COMPONENTS_SAFE_BROWSING_DB_SAFE_BROWSING_API_HANDLER_UTIL_H_
 
 #include <string>
@@ skipping 25 matching lines @@
   UMA_STATUS_UNSAFE = 3,
   UMA_STATUS_JSON_EMPTY = 4,
   UMA_STATUS_JSON_FAILED_TO_PARSE = 5,
   UMA_STATUS_JSON_UNKNOWN_THREAT = 6,
   UMA_STATUS_UNSUPPORTED = 7,
   UMA_STATUS_MAX_VALUE
 };
 
 // This parses the JSON from the GMSCore API and then:
 //   1) Picks the most severe threat type
-//   2) Parses remaining key/value pairs into a MalwarePatternType PB
-//      so DisplayBlockingPage() can unmarshal it.  We make this string
-//      is binary compatible with the Pver3 API's metadata string even
-//      though it comes from Pver4.
+//   2) Parses that threat's key/value pairs into the metadata struct.
 //
 // If anything fails to parse, this sets the threat to "safe".  The caller
 // should report the return value via UMA.
+UmaRemoteCallResult ParseJson(const std::string& metadata_str,

[mattm, 2016/02/26 02:32:23]

less generic name

+                              SBThreatType* worst_threat,
+                              ThreatMetadata* metadata);
+
+// DEPRECATED.  Will be removed.
 UmaRemoteCallResult ParseJsonToThreatAndPB(const std::string& metadata_str,
                                            SBThreatType* worst_threat,
                                            std::string* metadata_pb_str);
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_SAFE_BROWSING_API_HANDLER_UTIL_H_