More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/template_url.h

 // Copyright (c) 2012 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_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 233 matching lines @@
 struct TemplateURLData {
   TemplateURLData();
   ~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.
   string16 short_name;
 
   // The shortcut for this TemplateURL.  May be empty.
-  void SetKeyword(const string16& keyword) const;
+  void SetKeyword(const string16& keyword);
   const string16& keyword(const TemplateURL* t_url) const;
   // TODO(pkasting): This should only be necessary until we eliminate keyword
   // autogeneration.
   const string16& raw_keyword() const { return keyword_; }
 
   // Whether to autogenerate a keyword in TemplateURL::GetKeyword().  Most
   // consumers should not need this.
   // NOTE: Calling SetKeyword() turns this back off.  Manual and automatic
   // keywords are mutually exclusive.
-  void SetAutogenerateKeyword(bool autogenerate_keyword) const;
+  void SetAutogenerateKeyword(bool autogenerate_keyword);
   bool autogenerate_keyword() const { return autogenerate_keyword_; }
 
   // Ensures that the keyword is generated.  Most consumers should not need this
   // because it is done automatically.  Use this method on the UI thread, so
   // the keyword may be accessed on another thread.
   void EnsureKeyword(const TemplateURL* t_url) const;
 
   // The raw URL for the TemplateURL, which may not be valid as-is (e.g. because
   // it requires substitutions first).
   void SetURL(const std::string& url);
@@ skipping 60 matching lines @@
   std::string sync_guid;
 
  private:
   // Private so we can enforce using the setters.
   // TODO(pkasting): For now these setters are not critical, but later we will
   // begin using them to ensure that these fields are non-empty.
   mutable string16 keyword_;
   std::string url_;
 
   // TODO(pkasting): These fields will go away soon.
-  mutable bool autogenerate_keyword_;
+  bool autogenerate_keyword_;
   // True if the keyword was generated. This is used to avoid multiple attempts
   // if generating a keyword failed.
   mutable bool keyword_generated_;
 };
 
 
 // TemplateURL ----------------------------------------------------------------
 
 // A TemplateURL represents a single "search engine", defined primarily as a
 // subset of the Open Search Description Document
@@ skipping 32 matching lines @@
   void EnsureKeyword() const { data_.EnsureKeyword(this); }
 
   const std::string& url() const { return data_.url(); }
   const std::string& suggestions_url() const { return data_.suggestions_url; }
   const std::string& instant_url() const { return data_.instant_url; }
   const GURL& favicon_url() const { return data_.favicon_url; }
 
   const GURL& originating_url() const { return data_.originating_url; }
 
   bool show_in_default_list() const { return data_.show_in_default_list; }
-
   // Returns true if show_in_default_list() is true and this TemplateURL has a
   // TemplateURLRef that supports replacement.
   bool ShowInDefaultList() const;
 
   bool safe_for_autoreplace() const { return data_.safe_for_autoreplace; }
 
   const std::vector<std::string>& input_encodings() const {
     return data_.input_encodings;
   }
 
@@ skipping 26 matching lines @@
   std::string GetExtensionId() const;
   bool IsExtensionKeyword() const;
 
  private:
   friend class TemplateURLService;
 
   void SetURL(const std::string& url);
   void SetPrepopulateId(int id);
 
   // Invalidates cached values on this object and its child TemplateURLRefs.
-  void InvalidateCachedValues() const;
+  void InvalidateCachedValues();
 
   TemplateURLData data_;
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
   TemplateURLRef instant_url_ref_;
 
   // TODO(sky): Add date last parsed OSD file.
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_