[Favicon] Minor code cleanup.

chrome/common/favicon/favicon_url_parser.cc

Index: chrome/common/favicon/favicon_url_parser.cc
diff --git a/chrome/common/favicon/favicon_url_parser.cc b/chrome/common/favicon/favicon_url_parser.cc
index 16d78af4e9f816f4b8984310c7bd4518c5fe9118..49284fe00736eaca9d3e63b4bf79caff2d0d49f1 100644
--- a/chrome/common/favicon/favicon_url_parser.cc
+++ b/chrome/common/favicon/favicon_url_parser.cc
@@ -35,6 +35,7 @@ namespace chrome {
 bool ParseFaviconPath(const std::string& path,
                       int icon_types,
                       ParsedFaviconPath* parsed) {
+  DCHECK(parsed);

[pkotwicz, 2015/01/26 22:27:18]

I think the DCHECK() is not useful. If |parsed| is NULL, Line 39 will crash even
without a DCHECK()

[huangs, 2015/01/26 23:00:43]

It's a controlled-crash vs. uncontrolled-crash issue, which is the raison d'etre
of DCHECK().  I don't feel too strongly to push this though, so removed.

   parsed->is_icon_url = false;
   parsed->url = "";
   parsed->size_in_dip = gfx::kFaviconSize;
@@ -96,24 +97,22 @@ bool ParseFaviconPath(const std::string& path,
     parsed_index += strlen(kIconURLParameter);
     parsed->is_icon_url = true;
     parsed->url = path.substr(parsed_index);
-  } else {
+  } else if (HasSubstringAt(path, parsed_index, kOriginParameter)) {
     // URL requests prefixed with "origin/" are converted to a form with an
     // empty path and a valid scheme. (e.g., example.com -->
     // http://example.com/ or http://example.com/a --> http://example.com/)
-    if (HasSubstringAt(path, parsed_index, kOriginParameter)) {
-      parsed_index += strlen(kOriginParameter);
-      std::string possibly_invalid_url = path.substr(parsed_index);
+    parsed_index += strlen(kOriginParameter);
+    std::string possibly_invalid_url = path.substr(parsed_index);
 
-      // If the URL does not specify a scheme (e.g., example.com instead of
-      // http://example.com), add "http://" as a default.
-      if (!GURL(possibly_invalid_url).has_scheme())
-        possibly_invalid_url = "http://" + possibly_invalid_url;
+    // If the URL does not specify a scheme (e.g., example.com instead of
+    // http://example.com), add "http://" as a default.
+    if (!GURL(possibly_invalid_url).has_scheme())
+      possibly_invalid_url = "http://" + possibly_invalid_url;
 
-      // Strip the path beyond the top-level domain.
-      parsed->url = GURL(possibly_invalid_url).GetOrigin().spec();
-    } else {
-      parsed->url = path.substr(parsed_index);
-    }
+    // Strip the path beyond the top-level domain.
+    parsed->url = GURL(possibly_invalid_url).GetOrigin().spec();
+  } else {
+    parsed->url = path.substr(parsed_index);
   }
 
   // The parsed index needs to be returned in order to allow Instant Extended