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

chrome/browser/search_engines/template_url_service.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_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 510 matching lines @@
       TemplateURL* default_from_prefs);
 
   // Resets the sync GUID of the specified TemplateURL and persists the change
   // to the database. This does not notify observers.
   void ResetTemplateURLGUID(TemplateURL* url, const std::string& guid);
 
   // Attempts to generate a unique keyword for |turl| based on its original
   // 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:
   //   * If one of the TemplateURLs is replaceable and the other is not, the
   //     non-replaceable entry is better.
   //   * Otherwise, if |local_turl| was created by policy, is the default
   //     provider, or was modified more recently, it is better.
   //   * Otherwise |sync_turl| is better.
   // Then resolves the conflict:
   //   * If the "worse" entry is |sync_turl|, and it is replaceable, add a
@@ skipping 136 matching lines @@
 
   // This is used to log the origin of changes to the default search provider.
   // We set this value to increasingly specific values when we know what is the
   // cause/origin of a default search change.
   DefaultSearchChangeOrigin dsp_change_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_