Don't persist and sync omnibox extension keywords.

chrome/browser/ui/search_engines/keyword_editor_controller.cc

 // 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.
 
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
@@ skipping 42 matching lines @@
   if ((template_url->short_name() == title) &&
       (template_url->keyword() == keyword) && (template_url->url() == url))
     return;
 
   table_model_->ModifyTemplateURL(index, title, keyword, url);
 
   content::RecordAction(UserMetricsAction("KeywordEditor_ModifiedKeyword"));
 }
 
 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 {
   return url_model_->CanMakeDefault(url);
 }
 
 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) {
   table_model_->Remove(index);
   content::RecordAction(UserMetricsAction("KeywordEditor_RemoveKeyword"));
 }
 
 TemplateURL* KeywordEditorController::GetDefaultSearchProvider() {
   return url_model_->GetDefaultSearchProvider();
 }
 
 int KeywordEditorController::MakeDefaultTemplateURL(int index) {
   return table_model_->MakeDefaultTemplateURL(index);
 }
 
 bool KeywordEditorController::loaded() const {
   return url_model_->loaded();
 }
 
 TemplateURL* KeywordEditorController::GetTemplateURL(int index) {
   return table_model_->GetTemplateURL(index);
 }