Revert 96969 - Implement SyncableServices in TemplateURLService. Add related unittests.

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2011 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"
 #include "base/metrics/field_trial.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/common/guid.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/user_metrics.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
 // TODO(pastarmovj): Remove google_update_settings and user_metrics when the
 // CollectRLZMetrics function is not needed anymore.
 
 // The TemplateURLRef has any number of terms that need to be replaced. Each of
@@ skipping 607 matching lines @@
       keyword_generated_(false),
       show_in_default_list_(false),
       safe_for_autoreplace_(false),
       id_(0),
       date_created_(base::Time::Now()),
       last_modified_(base::Time::Now()),
       created_by_policy_(false),
       usage_count_(0),
       search_engine_type_(SEARCH_ENGINE_OTHER),
       logo_id_(kNoSearchEngineLogo),
-      prepopulate_id_(0),
-      sync_guid_(guid::GenerateGUID()) {
+      prepopulate_id_(0) {
 }
 
 TemplateURL::~TemplateURL() {
 }
 
 string16 TemplateURL::AdjustedShortNameForLocaleDirection() const {
   string16 bidi_safe_short_name = short_name_;
   base::i18n::AdjustStringForLocaleDirection(&bidi_safe_short_name);
   return bidi_safe_short_name;
 }
@@ skipping 67 matching lines @@
     if ((i->type == "image/x-icon" || i->type == "image/vnd.microsoft.icon")
         && i->width == kFaviconSize && i->height == kFaviconSize) {
       return i->url;
     }
   }
   return GURL();
 }
 
 void TemplateURL::SetPrepopulateId(int id) {
   prepopulate_id_ = id;
-  SetTemplateURLRefsPrepopulated(id > 0);
+  if (id > 0)
+    SetTemplateURLRefsPrepopulated(true);
+  else
+    SetTemplateURLRefsPrepopulated(false);
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_) {
     keyword_.clear();
     keyword_generated_ = false;
   }
 }
 
 void TemplateURL::SetTemplateURLRefsPrepopulated(bool prepopulated) {
   suggestions_url_.set_prepopulated(prepopulated);
   url_.set_prepopulated(prepopulated);
   instant_url_.set_prepopulated(prepopulated);
 }
 
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(url_.url()).host();
 }
 
 bool TemplateURL::IsExtensionKeyword() const {
   return GURL(url_.url()).SchemeIs(chrome::kExtensionScheme);
 }