webui: Change slightly how the scale-factor gets parsed from a URL.

chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

Index: chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
index c9bbb1ba10223f9a4e71309b94510aa37b29148a..a571ed7098ba9d618c2539bcba357c7d7bd116d2 100644
--- a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
@@ -31,21 +31,7 @@ void ParseRequest(const GURL& url,
                   bool* is_image_animated,
                   ui::ScaleFactor* scale_factor) {
   DCHECK(url.is_valid());
-
-  *email = url.path();
-  email->erase(0, 1);  // Strip initial slash.
-
-  // TODO(ivankr): when all chrome://userimage URLs have a valid @<scale>x,
-  // remove this and pass |email| instead of |&path| to ParsePathAndScale.
-  size_t pos = email->find('@');
-  if (pos != std::string::npos) {
-    pos = email->find('@', pos + 1);
-    if (pos != std::string::npos)
-      email->erase(pos);
-  }
-  std::string path;
-  web_ui_util::ParsePathAndScale(url, &path, scale_factor);
-
+  web_ui_util::ParsePathAndScale(url, email, scale_factor);
   std::string url_spec = url.possibly_invalid_spec();
   url_parse::Component query = url.parsed_for_possibly_invalid_spec().query;
   url_parse::Component key, value;