Fix the resolution issue with picture url. Fallback to default url,

if individual resolution url parsing fails.

Bug: 1140575
Change-Id: Iebe612418486a2650632f0861c2622a426b65e9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2487825
Commit-Queue: Rakesh Soma <rakeshsoma@google.com>
Reviewed-by: Yusuf Sengul <yusufsn@google.com>
Cr-Commit-Position: refs/heads/master@{#819193}

chrome/credential_provider/gaiacp/scoped_user_profile.cc

@@ -327,8 +327,15 @@ HRESULT UpdateProfilePicturesForWindows8AndNewer(
       continue;
     }
 
-    std::string current_picture_url =
-        base::UTF16ToUTF8(picture_url) + base::StringPrintf("=s%i", image_size);
+    std::size_t found = base::UTF16ToUTF8(picture_url).rfind("=s");
+    std::string current_picture_url;
+    if (found != std::string::npos)
+      current_picture_url = base::UTF16ToUTF8(picture_url).substr(0, found) +
+                            base::StringPrintf("=s%i", image_size);
+    else
+      // Fallback to default picture url if parsing fails.
+      current_picture_url = base::UTF16ToUTF8(picture_url) +
+                            base::StringPrintf("=s%i", image_size);
 
     auto fetcher = WinHttpUrlFetcher::Create(GURL(current_picture_url));
     if (!fetcher) {