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

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
===================================================================
--- chrome/browser/search_engines/template_url.cc	(revision 97034)
+++ chrome/browser/search_engines/template_url.cc	(working copy)
@@ -15,7 +15,6 @@
 #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"
@@ -643,8 +642,7 @@
       usage_count_(0),
       search_engine_type_(SEARCH_ENGINE_OTHER),
       logo_id_(kNoSearchEngineLogo),
-      prepopulate_id_(0),
-      sync_guid_(guid::GenerateGUID()) {
+      prepopulate_id_(0) {
 }
 
 TemplateURL::~TemplateURL() {
@@ -732,7 +730,10 @@
 
 void TemplateURL::SetPrepopulateId(int id) {
   prepopulate_id_ = id;
-  SetTemplateURLRefsPrepopulated(id > 0);
+  if (id > 0)
+    SetTemplateURLRefsPrepopulated(true);
+  else
+    SetTemplateURLRefsPrepopulated(false);
 }
 
 void TemplateURL::InvalidateCachedValues() const {