Made the deletion of the default search provider defensive in TemplateURLService.

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index c029e2b32d8cb82ad873966b21380c5609f5316e..5976224f5e10befd5c7e0732eb539db6adb54d0f 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -528,8 +528,9 @@ class TemplateURLService : public WebDataServiceConsumer,
   // keyword. If its keyword is already unique, that is returned. Otherwise, it
   // tries to return the autogenerated keyword if that is unique to the Service,
   // and finally it repeatedly appends special characters to the keyword until
-  // it is unique to the Service.
-  string16 UniquifyKeyword(const TemplateURL& turl);
+  // it is unique to the Service. If |force| is true, then this will only
+  // execute the special character appending functionality.
+  string16 UniquifyKeyword(const TemplateURL& turl, bool force);
 
   // Given a TemplateURL from Sync (cloud) and a local, non-extension
   // TemplateURL with the same keyword, selects "better" and "worse" entries: