More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/template_url.cc

 // 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.
 
 #include "chrome/browser/search_engines/template_url.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 567 matching lines @@
       usage_count(0),
       prepopulate_id(0),
       sync_guid(guid::GenerateGUID()),
       autogenerate_keyword_(false),
       keyword_generated_(false) {
 }
 
 TemplateURLData::~TemplateURLData() {
 }
 
-void TemplateURLData::SetKeyword(const string16& keyword) const {
+void TemplateURLData::SetKeyword(const string16& keyword) {
   // Case sensitive keyword matching is confusing. As such, we force all
   // keywords to be lower case.
   keyword_ = base::i18n::ToLower(keyword);
   autogenerate_keyword_ = false;
 }
 
 const string16& TemplateURLData::keyword(const TemplateURL* t_url) const {
   EnsureKeyword(t_url);
   return keyword_;
 }
 
-void TemplateURLData::SetAutogenerateKeyword(bool autogenerate_keyword) const {
+void TemplateURLData::SetAutogenerateKeyword(bool autogenerate_keyword) {
   autogenerate_keyword_ = autogenerate_keyword;
   if (autogenerate_keyword_) {
     keyword_.clear();
     keyword_generated_ = false;
   }
 }
 
 void TemplateURLData::EnsureKeyword(const TemplateURL* t_url) const {
   if (autogenerate_keyword_ && !keyword_generated_) {
     // Generate a keyword and cache it.
@@ skipping 91 matching lines @@
 }
 
 void TemplateURL::SetURL(const std::string& url) {
   data_.SetURL(url);
   url_ref_.InvalidateCachedValues();
 }
 
 void TemplateURL::SetPrepopulateId(int id) {
   data_.prepopulate_id = id;
   const bool prepopulated = id > 0;
+  url_ref_.prepopulated_ = prepopulated;
   suggestions_url_ref_.prepopulated_ = prepopulated;
-  url_ref_.prepopulated_ = prepopulated;
   instant_url_ref_.prepopulated_ = prepopulated;
 }
 
-void TemplateURL::InvalidateCachedValues() const {
+void TemplateURL::InvalidateCachedValues() {
   url_ref_.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
   instant_url_ref_.InvalidateCachedValues();
   data_.SetAutogenerateKeyword(data_.autogenerate_keyword());
 }