Pass Physical Web metadata through a struct

ios/chrome/common/physical_web/physical_web_scanner.mm

 // 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.
 
 #import "ios/chrome/common/physical_web/physical_web_scanner.h"
 
 #import <CoreBluetooth/CoreBluetooth.h>
 
 #include <string>
 #include <vector>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "components/physical_web/data_source/physical_web_data_source.h"
 #include "device/bluetooth/uribeacon/uri_encoder.h"
 #import "ios/chrome/common/physical_web/physical_web_device.h"
 #import "ios/chrome/common/physical_web/physical_web_request.h"
 #import "ios/chrome/common/physical_web/physical_web_types.h"
+#include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 
 NSString* const kUriBeaconServiceUUID = @"FED8";
 NSString* const kEddystoneBeaconServiceUUID = @"FEAA";
 
@@ skipping 145 matching lines @@
       return NSOrderedDescending;
     }
     if ([device1 rank] < [device2 rank]) {
       return NSOrderedAscending;
     }
     return NSOrderedSame;
   }];
 }
 
 - (std::unique_ptr<base::ListValue>)metadata {
-  auto metadataList = base::MakeUnique<base::ListValue>();
+  auto metadataRet = base::MakeUnique<base::ListValue>();
 
   for (PhysicalWebDevice* device in [self devices]) {
     std::string scannedUrl =
         base::SysNSStringToUTF8([[device requestURL] absoluteString]);
     std::string resolvedUrl =
         base::SysNSStringToUTF8([[device url] absoluteString]);
     std::string icon = base::SysNSStringToUTF8([[device icon] absoluteString]);
     std::string title = base::SysNSStringToUTF8([device title]);
     std::string description = base::SysNSStringToUTF8([device description]);
 
     auto metadataItem = base::MakeUnique<base::DictionaryValue>();
     metadataItem->SetString(physical_web::kScannedUrlKey, scannedUrl);
     metadataItem->SetString(physical_web::kResolvedUrlKey, resolvedUrl);
     metadataItem->SetString(physical_web::kIconUrlKey, icon);
     metadataItem->SetString(physical_web::kTitleKey, title);
     metadataItem->SetString(physical_web::kDescriptionKey, description);
-    metadataList->Append(std::move(metadataItem));
+    metadataRet->Append(std::move(metadataItem));
   }
 
-  return metadataList;
+  return metadataRet;
+}
+
+- (std::unique_ptr<physical_web::MetadataList>)metadataList {
+  auto metadataRet = base::MakeUnique<physical_web::MetadataList>();
+
+  for (PhysicalWebDevice* device in [self devices]) {
+    std::string scannedUrl =
+        base::SysNSStringToUTF8([[device requestURL] absoluteString]);
+    std::string resolvedUrl =
+        base::SysNSStringToUTF8([[device url] absoluteString]);
+    std::string icon = base::SysNSStringToUTF8([[device icon] absoluteString]);
+    std::string title = base::SysNSStringToUTF8([device title]);
+    std::string description = base::SysNSStringToUTF8([device description]);
+
+    physical_web::Metadata metadataItem;
+    metadataItem.scanned_url = GURL(scannedUrl);
+    metadataItem.resolved_url = GURL(resolvedUrl);
+    metadataItem.icon_url = GURL(icon);
+    metadataItem.title = title;
+    metadataItem.description = description;
+    metadataRet->push_back(std::move(metadataItem));
+  }
+
+  return metadataRet;
 }
 
 - (void)setNetworkRequestEnabled:(BOOL)enabled {
   if (networkRequestEnabled_ == enabled) {
     return;
   }
   networkRequestEnabled_ = enabled;
   if (!networkRequestEnabled_)
     return;
 
@@ skipping 273 matching lines @@
         [strongSelf.get()->devices_ addObject:device];
         [strongSelf.get()->delegate_ scannerUpdatedDevices:weakSelf];
         [strongSelf.get()->finalUrls_ addObject:[device url]];
       }
     }
     [strongSelf.get()->pendingRequests_ removeObject:strongRequest];
   }];
 }
 
 @end