[Contextual Search] Update GetUrlForContextualSearchQuery.

components/search_engines/template_url.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 61 matching lines @@
   // TemplateURLRef::ReplaceSearchTerms methods.  By default, only search_terms
   // is required and is passed in the constructor.
   struct SearchTermsArgs {
     explicit SearchTermsArgs(const base::string16& search_terms);
     ~SearchTermsArgs();
 
     struct ContextualSearchParams {
       ContextualSearchParams();
       // Used when the content is sent in the HTTP header instead of as CGI
       // parameters.
-      // TODO(jeremycho): Remove base_page_url and selection parameters once
+      // TODO(donnd): Remove base_page_url and selection parameters once
       // they are logged from the HTTP header.
       ContextualSearchParams(const int version,
                              const std::string& selection,
                              const std::string& base_page_url,
                              const bool resolve);
-      // TODO(jeremycho): Delete constructor once Clank no longer depends on it.
+      // TODO(donnd): Delete constructor once Clank, iOS, and tests no
+      // longer depend on it.
       ContextualSearchParams(const int version,
                              const size_t start,
                              const size_t end,
                              const std::string& selection,
                              const std::string& content,
                              const std::string& base_page_url,
                              const std::string& encoding,
                              const bool resolve);
       ~ContextualSearchParams();
 
@@ skipping 646 matching lines @@
   TemplateURLRef new_tab_url_ref_;
   TemplateURLRef contextual_search_url_ref_;
   scoped_ptr<AssociatedExtensionInfo> extension_info_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_