[Mac] Prevent search engines from disappearing in the preferences list

chrome/browser/cocoa/search_engine_list_model.mm

Index: chrome/browser/cocoa/search_engine_list_model.mm
diff --git a/chrome/browser/cocoa/search_engine_list_model.mm b/chrome/browser/cocoa/search_engine_list_model.mm
index 190023166290f54b477e77725888a8aeb144ffb3..748ede081a48008ca2d74b88e8b79fc8754d62a3 100644
--- a/chrome/browser/cocoa/search_engine_list_model.mm
+++ b/chrome/browser/cocoa/search_engine_list_model.mm
@@ -88,14 +88,19 @@ class SearchEngineObserver : public TemplateURLModelObserver {
 - (NSUInteger)defaultIndex {
   if (!model_) return 0;
 
+  NSUInteger index = 0;
   const TemplateURL* defaultSearchProvider = model_->GetDefaultSearchProvider();
   if (defaultSearchProvider) {
     typedef std::vector<const TemplateURL*> TemplateURLs;
     TemplateURLs urls = model_->GetTemplateURLs();
-    TemplateURLs::iterator i =
-        find(urls.begin(), urls.end(), defaultSearchProvider);
-    if (i != urls.end())
-      return static_cast<int>(i - urls.begin());
+    for (std::vector<const TemplateURL*>::iterator it = urls.begin();
+        it != urls.end(); ++it) {

[pink (ping after 24hrs), 2009/11/02 15:46:23]

align with |std| above, not paren.

+      const TemplateURL* url = *it;
+      if (url->id() == defaultSearchProvider->id())
+        return index;
+      if (url->ShowInDefaultList())
+        ++index;
+    }
   }
   return 0;
 }