Removed restriction for {} so that javascript blocks can be used in the url....

chrome/browser/search_engines/template_url.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
+#include <string>
 #include <vector>
 
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class TemplateURL;
 
 // TemplateURL represents the relevant portions of the Open Search Description
 // Document (http://www.opensearch.org/Specifications/OpenSearch).
 // The main use case for TemplateURL is to use the TemplateURLRef returned by
 // suggestions_url or url for keyword/suggestion expansion:
 // . suggestions_url describes a URL that is ideal for as you type suggestions.
 //   The returned results are in the mime type application/x-suggestions+json.
 // . url describes a URL that may be used as a shortcut. Returned results are
@@ skipping 82 matching lines @@
                                 const std::string& term) const;
 
   // Returns true if this TemplateURLRef has a replacement term of
   // {google:baseURL} or {google:baseSuggestURL}.
   bool HasGoogleBaseURLs() const;
 
  private:
   friend class TemplateURL;
   friend class TemplateURLModelTest;
   friend class TemplateURLTest;
+  FRIEND_TEST(TemplateURLTest, ParseParameterKnown);
+  FRIEND_TEST(TemplateURLTest, ParseParameterUnknown);
+  FRIEND_TEST(TemplateURLTest, ParseURLEmpty);
+  FRIEND_TEST(TemplateURLTest, ParseURLNoTemplateEnd);
+  FRIEND_TEST(TemplateURLTest, ParseURLNoKnownParameters);
+  FRIEND_TEST(TemplateURLTest, ParseURLTwoParameters);
+  FRIEND_TEST(TemplateURLTest, ParseURLNestedParameter);
 
   // Enumeration of the known types.
   enum ReplacementType {
     ENCODING,
     GOOGLE_ACCEPTED_SUGGESTION,
     GOOGLE_BASE_URL,
     GOOGLE_BASE_SUGGEST_URL,
     GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
     GOOGLE_RLZ,
     GOOGLE_UNESCAPED_SEARCH_TERMS,
@@ skipping 15 matching lines @@
   // method invalidates any cached values.
   void InvalidateCachedValues() const;
 
   // Resets the url.
   void Set(const std::wstring& url, int index_offset, int page_offset);
 
   // Parses the parameter in url at the specified offset. start/end specify the
   // range of the parameter in the url, including the braces. If the parameter
   // is valid, url is updated to reflect the appropriate parameter. If
   // the parameter is one of the known parameters an element is added to
-  // replacements indicating the type and range of the element.
+  // replacements indicating the type and range of the element. The original
+  // parameter is erased from the url.
   //
-  // If the parameter is not a known parameter, false is returned.
+  // If the parameter is not a known parameter, it's not erased and false is
+  // returned.
   bool ParseParameter(size_t start,
                       size_t end,
                       std::wstring* url,
                       Replacements* replacements) const;
 
   // Parses the specified url, replacing parameters as necessary. If
   // successful, valid is set to true, and the parsed url is returned. For all
   // known parameters that are encountered an entry is added to replacements.
-  // If there is an error parsing (unknown parameter, or bogus url), valid is
-  // set to false, and an empty string is returned.
+  // If there is an error parsing the url, valid is set to false, and an empty
+  // string is returned.
   std::wstring ParseURL(const std::wstring& url,
                         Replacements* replacements,
                         bool* valid) const;
 
   // If the url has not yet been parsed, ParseURL is invoked.
   // NOTE: While this is const, it modifies parsed_, valid_, parsed_url_ and
   // search_offset_.
   void ParseIfNecessary() const;
 
   // Extracts the query key and host from the url.
@@ skipping 261 matching lines @@
   std::vector<std::string> input_encodings_;
   IDType id_;
   base::Time date_created_;
   int usage_count_;
   int prepopulate_id_;
 
   // TODO(sky): Add date last parsed OSD file.
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_