Retrieve article original URL from entryID

components/dom_distiller/core/url_utils.cc

 // Copyright 2014 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 "components/dom_distiller/core/url_utils.h"
 
 #include <string>
 
 #include "base/guid.h"
 #include "components/dom_distiller/core/url_constants.h"
@@ skipping 15 matching lines @@
   GURL url(scheme + "://" + base::GenerateGUID());
   return net::AppendOrReplaceQueryParameter(url, kEntryIdKey, entry_id);
 }
 
 const GURL GetDistillerViewUrlFromUrl(const std::string& scheme,
                                       const GURL& view_url) {
   GURL url(scheme + "://" + base::GenerateGUID());
   return net::AppendOrReplaceQueryParameter(url, kUrlKey, view_url.spec());
 }
 
+std::string GetValueForKeyInUrl(const GURL& url, const std::string& key) {
+  std::string value;

[robliao, 2014/08/13 23:43:15]

Move declaration to after return "" (Minimal scope)

[sunangel, 2014/08/13 23:47:15]

Done.

+  if (!url.is_valid())
+    return "";
+  if (net::GetValueForKeyInQuery(url, key, &value)) {
+    return value;
+  }
+  return "";
+}
+
 std::string GetValueForKeyInUrlPathQuery(const std::string& path,
                                          const std::string& key) {
   // Tools for retrieving a value in a query only works with full GURLs, so
   // using a dummy scheme and host to create a fake URL which can be parsed.
   GURL dummy_url(kDummyInternalUrlPrefix + path);
-  std::string value;
-  net::GetValueForKeyInQuery(dummy_url, key, &value);
-  return value;
+  return GetValueForKeyInUrl(dummy_url, key);
 }
 
 bool IsUrlDistillable(const GURL& url) {
   return url.is_valid() && url.SchemeIsHTTPOrHTTPS();
 }
 
 bool IsDistilledPage(const GURL& url) {
   return url.is_valid() && url.scheme() == kDomDistillerScheme;
 }
 
 }  // namespace url_utils
 
 }  // namespace dom_distiller