[ios] Fix scoping of variables in policy code.

BUG=1096117

Change-Id: I8f02f2c9a5f3da8c3e4560d33a2f04287abd901c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248730Reviewed-by: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779788}

components/policy/core/browser/url_blacklist_manager.cc

@@ -104,7 +104,7 @@ bool BypassBlacklistWildcardForURL(const GURL& url) {
   // Leading and trailing slashes must be removed because the host name is
   // parsed as the URL path (which may contain slashes).
   base::StringPiece trimmed_path =
-      base::TrimString(url.path(), "/", base::TrimPositions::TRIM_ALL);
+      base::TrimString(url.path_piece(), "/", base::TrimPositions::TRIM_ALL);
   if (scheme == kIosNtpAboutScheme && trimmed_path == kIosNtpHost) {
     return true;
   }

ios/chrome/browser/policy/policy_app_interface.mm

@@ -49,8 +49,8 @@ std::unique_ptr<base::Value> DeserializeValue(NSString* json_value) {
     return std::make_unique<base::Value>(base::Value::Type::NONE);
   }
 
-  JSONStringValueDeserializer deserializer(
-      base::SysNSStringToUTF8((json_value)));
+  std::string json = base::SysNSStringToUTF8(json_value);
+  JSONStringValueDeserializer deserializer(json);
   return deserializer.Deserialize(/*error_code=*/nullptr,
                                   /*error_message=*/nullptr);
 }