Cache SearchEngineType of TemplateURL

components/search_engines/template_url_data.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_DATA_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
+#include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_id.h"
 #include "url/gurl.h"
 
+class SearchTermsData;
+class TemplateURL;
+
 // The data for the TemplateURL.  Separating this into its own class allows most
 // users to do SSA-style usage of TemplateURL: construct a TemplateURLData with
 // whatever fields are desired, then create an immutable TemplateURL from it.
 struct TemplateURLData {
   TemplateURLData();
   TemplateURLData(const TemplateURLData& other);
   ~TemplateURLData();
 
   // A short description of the template. This is the name we show to the user
   // in various places that use TemplateURLs. For example, the location bar
   // shows this when the user selects a substituting match.
   void SetShortName(const base::string16& short_name);
   const base::string16& short_name() const { return short_name_; }
 
   // The shortcut for this TemplateURL.  |keyword| must be non-empty.
   void SetKeyword(const base::string16& keyword);
   const base::string16& keyword() const { return keyword_; }
 
   // The raw URL for the TemplateURL, which may not be valid as-is (e.g. because
   // it requires substitutions first).  This must be non-empty.
   void SetURL(const std::string& url);
   const std::string& url() const { return url_; }
 
+  // Returns the type of this search engine, or SEARCH_ENGINE_OTHER if no
+  // engines match. |template_url_hint| is a TemplateURL which owns this
+  // TemplateURLData. If |template_url_hint| is nullptr it's ignored.
+  SearchEngineType GetEngineType(
+      const SearchTermsData& search_terms_data,
+      const TemplateURL* template_url_hint = nullptr) const;

[Peter Kasting, 2016/06/09 23:00:56]

Supplying a null second arg is only used by one test, AFAICT.  Let's just change
that test to construct a TemplateURL and call through that.  Then this can be
named |template_url| and can always be non-null.  This will also simplify the
implementation noticeably.

[Vitaly Baranov, 2016/06/12 07:29:15]

Done.

+
   // Optional additional raw URLs.
   std::string suggestions_url;
   std::string instant_url;
   std::string image_url;
   std::string new_tab_url;
   std::string contextual_search_url;
 
   // The following post_params are comma-separated lists used to specify the
   // post parameters for the corresponding URL.
   std::string search_url_post_params;
@@ skipping 64 matching lines @@
   // A parameter that, if present in the query or ref parameters of a search_url
   // or instant_url, causes Chrome to replace the URL with the search term.
   std::string search_terms_replacement_key;
 
  private:
   // Private so we can enforce using the setters and thus enforce that these
   // fields are never empty.
   base::string16 short_name_;
   base::string16 keyword_;
   std::string url_;
+
+  // Mutable to allow GetEngineType() to assign it implicitly.

[Peter Kasting, 2016/06/09 23:00:56]

Nit: This is sort of implied by the mutable keyword.  How about: "Caches the
computed engine type across successive calls to GetEngineType()."

[Vitaly Baranov, 2016/06/12 07:29:15]

Done.

+  mutable SearchEngineType engine_type_;
 };

[Peter Kasting, 2016/06/09 23:00:56]

NIt: While here: DISALLOW_COPY_AND_ASSIGN

[Vitaly Baranov, 2016/06/12 07:29:15]

TemplateURLData has a copy constructor.

 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_DATA_H_