Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.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/json/json_string_value_serializer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
+#include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kManifest[] = "{"
     " \"version\" : \"1.0.0.0\","
     " \"name\" : \"Test\","
     " \"chrome_settings_overrides\" : {"
@@ skipping 92 matching lines @@
   ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
   scoped_refptr<Extension> extension = Extension::Create(
       base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
       Manifest::INVALID_LOCATION,
       *static_cast<base::DictionaryValue*>(root.get()),
       Extension::NO_FLAGS,
       &error);
 #if defined(OS_WIN)
   EXPECT_FALSE(extension);
   EXPECT_EQ(
-      std::string(extensions::manifest_errors::kInvalidEmptySettingsOverrides),
+      extensions::ErrorUtils::FormatErrorMessage(
+          extensions::manifest_errors::kInvalidEmptyDictionary,
+          extensions::manifest_keys::kSettingsOverride),
       error);
 #else
   EXPECT_TRUE(extension);
   EXPECT_FALSE(
       extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
 #endif
 }
 
 }  // namespace