Don't persist and sync omnibox extension keywords.

chrome/browser/ui/search_engines/keyword_editor_controller.cc

Index: chrome/browser/ui/search_engines/keyword_editor_controller.cc
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
index 116a22306d0e1f8e1fb90ccb7304f5f28e7e8532..0087427c9c49ae75b5646ddcdb46c9ef8f1bcbc5 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -60,9 +60,9 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
 }
 
 bool KeywordEditorController::CanEdit(const TemplateURL* url) const {
-  return (url->GetType() != TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) &&
-      (!url_model_->is_default_search_managed() ||
-       (url != url_model_->GetDefaultSearchProvider()));
+  return (url->GetType() == TemplateURL::NORMAL) &&
+      (url != url_model_->GetDefaultSearchProvider() ||
+       !url_model_->is_default_search_managed());
 }
 
 bool KeywordEditorController::CanMakeDefault(const TemplateURL* url) const {
@@ -70,7 +70,8 @@ bool KeywordEditorController::CanMakeDefault(const TemplateURL* url) const {
 }
 
 bool KeywordEditorController::CanRemove(const TemplateURL* url) const {
-  return url != url_model_->GetDefaultSearchProvider();
+  return (url->GetType() == TemplateURL::NORMAL) &&
+      (url != url_model_->GetDefaultSearchProvider());
 }
 
 void KeywordEditorController::RemoveTemplateURL(int index) {