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

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

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
@@ skipping 13 matching lines @@
 const char kKeyAnimated[] = "animated";
 
 // Parses the user image URL, which looks like
 // "chrome://userimage/user@host?key1=value1&...&key_n=value_n@<scale>x",
 // to user email, optional parameters and scale factor.
 void ParseRequest(const GURL& url,
                   std::string* email,
                   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;
   *is_image_animated = false;
   while (ExtractQueryKeyValue(url_spec.c_str(), &query, &key, &value)) {
     if (url_spec.substr(key.begin, key.len) == kKeyAnimated) {
       *is_image_animated = true;
       break;
     }
   }
@@ skipping 60 matching lines @@
   if (is_image_animated) {
     const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
     if (user && user->has_animated_image())
       return "image/gif";
   }
   return "image/png";
 }
 
 }  // namespace options2
 }  // namespace chromeos