Switch Safe Browsing's metadata from string to struct.

chrome/browser/safe_browsing/ui_manager.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/safe_browsing/ui_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/debug/leak_tracker.h"
@@ skipping 134 matching lines @@
 
 void SafeBrowsingUIManager::DisplayBlockingPage(
     const UnsafeResource& resource) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (resource.is_subresource && !resource.is_subframe) {
     // Sites tagged as serving Unwanted Software should only show a warning for
     // main-frame or sub-frame resource. Similar warning restrictions should be
     // applied to malware sites tagged as "landing sites" (see "Types of
     // Malware sites" under
     // https://developers.google.com/safe-browsing/developers_guide_v3#UserWarnings).
+    // TODO(nparker): Replace the use of raw_metadata when other fields are
+    // populated. crbug/589610
     MalwarePatternType proto;
     if (resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED ||
         (resource.threat_type == SB_THREAT_TYPE_URL_MALWARE &&
-         !resource.threat_metadata.empty() &&
-         proto.ParseFromString(resource.threat_metadata) &&
+         !resource.threat_metadata.raw_metadata.empty() &&
+         proto.ParseFromString(resource.threat_metadata.raw_metadata) &&
          proto.pattern_type() == MalwarePatternType::LANDING)) {
       if (!resource.callback.is_null()) {
         DCHECK(resource.callback_thread);
         resource.callback_thread->PostTask(FROM_HERE,
                                            base::Bind(resource.callback, true));
       }
 
       return;
     }
   }
@@ skipping 192 matching lines @@
   }
 
   WhitelistUrlSet* site_list =
       static_cast<WhitelistUrlSet*>(web_contents->GetUserData(kWhitelistKey));
   if (!site_list)
     return false;
   return site_list->Contains(maybe_whitelisted_url);
 }
 
 }  // namespace safe_browsing