Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

 // Copyright 2013 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/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 243 matching lines @@
   if (info->bookmarks_ui && !info->bookmarks_ui->remove_button &&
       info->bookmarks_ui->hide_bookmark_button) {
     info->bookmarks_ui->remove_button.reset(
         new bool(*info->bookmarks_ui->hide_bookmark_button));
   }
   info->homepage = ParseHomepage(*settings, error);
   info->search_engine = ParseSearchEngine(settings.get(), error);
   info->startup_pages = ParseStartupPage(*settings, error);
   if (!info->bookmarks_ui && !info->homepage &&
       !info->search_engine && info->startup_pages.empty()) {
-    *error =
-        base::ASCIIToUTF16(manifest_errors::kInvalidEmptySettingsOverrides);
+    *error = ErrorUtils::FormatErrorMessageUTF16(
+        manifest_errors::kInvalidEmptyDictionary,
+        manifest_keys::kSettingsOverride);
     return false;
   }
   info->manifest_permission.reset(new ManifestPermissionImpl(
       SettingsOverrides::RemovesBookmarkButton(*info)));
 
   APIPermissionSet* permission_set =
       PermissionsData::GetInitialAPIPermissions(extension);
   DCHECK(permission_set);
   if (info->search_engine) {
     permission_set->insert(new SettingsOverrideAPIPermission(
@@ skipping 52 matching lines @@
   const SettingsOverrides* data = SettingsOverrides::Get(extension);
   if (data)
     return data->manifest_permission->Clone();
   return NULL;
 }
 const std::vector<std::string> SettingsOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kSettingsOverride);
 }
 
 }  // namespace extensions