Switch Safe Browsing's metadata from string to struct.

components/safe_browsing_db/v4_get_hash_protocol_manager_unittest.cc

 // Copyright 2016 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 <vector>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "components/safe_browsing_db/safebrowsing.pb.h"
+#include "components/safe_browsing_db/testing_util.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 113 matching lines @@
 }
 
 TEST_F(SafeBrowsingV4GetHashProtocolManagerTest, TestGetHashErrorHandlingOK) {
   net::TestURLFetcherFactory factory;
   scoped_ptr<V4GetHashProtocolManager> pm(CreateProtocolManager());
 
   std::vector<SBPrefix> prefixes;
   std::vector<SBFullHashResult> expected_full_hashes;
   SBFullHashResult hash_result;
   hash_result.hash = SBFullHashForString("Everything's shiny, Cap'n.");
-  hash_result.metadata = "NOTIFICATIONS,";
+  hash_result.metadata.api_permissions.push_back("NOTIFICATIONS");
   hash_result.cache_duration = base::TimeDelta::FromSeconds(300);
   expected_full_hashes.push_back(hash_result);
   base::TimeDelta expected_cache_duration = base::TimeDelta::FromSeconds(600);
 
   pm->GetFullHashesWithApis(
       prefixes, base::Bind(&ValidateGetV4HashResults, expected_full_hashes,
                            expected_cache_duration));
 
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   DCHECK(fetcher);
@@ skipping 66 matching lines @@
 
   Time now = Time::Now();
   std::vector<SBFullHashResult> full_hashes;
   base::TimeDelta cache_lifetime;
   EXPECT_TRUE(pm->ParseHashResponse(res_data, &full_hashes, &cache_lifetime));
 
   EXPECT_EQ(base::TimeDelta::FromSeconds(600), cache_lifetime);
   EXPECT_EQ(1ul, full_hashes.size());
   EXPECT_TRUE(SBFullHashEqual(SBFullHashForString("Everything's shiny, Cap'n."),
                               full_hashes[0].hash));
-  EXPECT_EQ("NOTIFICATIONS,", full_hashes[0].metadata);
+  EXPECT_EQ(1ul, full_hashes[0].metadata.api_permissions.size());
+  EXPECT_EQ("NOTIFICATIONS", full_hashes[0].metadata.api_permissions[0]);
   EXPECT_EQ(base::TimeDelta::FromSeconds(300), full_hashes[0].cache_duration);
   EXPECT_LE(now + base::TimeDelta::FromSeconds(400), pm->next_gethash_time_);
 }
 
 // Adds an entry with an ignored ThreatEntryType.
 TEST_F(SafeBrowsingV4GetHashProtocolManagerTest,
        TestParseHashResponseWrongThreatEntryType) {
   scoped_ptr<V4GetHashProtocolManager> pm(CreateProtocolManager());
 
   FindFullHashesResponse res;
@@ skipping 68 matching lines @@
   std::vector<SBFullHashResult> full_hashes;
   base::TimeDelta cache_lifetime;
   EXPECT_TRUE(pm->ParseHashResponse(res_data, &full_hashes, &cache_lifetime));
 
   EXPECT_EQ(base::TimeDelta::FromSeconds(600), cache_lifetime);
   EXPECT_EQ(1ul, full_hashes.size());
 
   EXPECT_TRUE(SBFullHashEqual(SBFullHashForString("Not to fret."),
                               full_hashes[0].hash));
   // Metadata should be empty.
-  EXPECT_EQ("", full_hashes[0].metadata);
+  EXPECT_EQ(0ul, full_hashes[0].metadata.api_permissions.size());
   EXPECT_EQ(base::TimeDelta::FromSeconds(0), full_hashes[0].cache_duration);
 }
 
 TEST_F(SafeBrowsingV4GetHashProtocolManagerTest,
        TestParseHashResponseInconsistentThreatTypes) {
   scoped_ptr<V4GetHashProtocolManager> pm(CreateProtocolManager());
 
   FindFullHashesResponse res;
   ThreatMatch* m1 = res.add_matches();
   m1->set_threat_type(API_ABUSE);
@@ skipping 11 matching lines @@
   // Serialize.
   std::string res_data;
   res.SerializeToString(&res_data);
 
   std::vector<SBFullHashResult> full_hashes;
   base::TimeDelta cache_lifetime;
   EXPECT_FALSE(pm->ParseHashResponse(res_data, &full_hashes, &cache_lifetime));
 }
 
 }  // namespace safe_browsing