Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it

chrome/browser/extensions/api/storage/storage_api.cc

Index: chrome/browser/extensions/api/storage/storage_api.cc
diff --git a/chrome/browser/extensions/settings/settings_api.cc b/chrome/browser/extensions/api/storage/storage_api.cc
similarity index 92%
rename from chrome/browser/extensions/settings/settings_api.cc
rename to chrome/browser/extensions/api/storage/storage_api.cc
index 35f4eaf434dcd8bde0ff3f050a2bb0cf8ae0ab30..8be3087aad8c394d053dc6d193acd207ed2b6dbe 100644
--- a/chrome/browser/extensions/settings/settings_api.cc
+++ b/chrome/browser/extensions/api/storage/storage_api.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/settings/settings_api.h"
+#include "chrome/browser/extensions/api/storage/storage_api.h"
 
 #include <string>
 #include <vector>
@@ -10,9 +10,9 @@
 #include "base/bind.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
-#include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/storage.h"
 #include "content/public/browser/browser_thread.h"
@@ -162,7 +162,7 @@ void GetModificationQuotaLimitHeuristics(QuotaLimitHeuristics* heuristics) {
 
 }  // namespace
 
-bool GetSettingsFunction::RunWithStorage(ValueStore* storage) {
+bool StorageGetFunction::RunWithStorage(ValueStore* storage) {
   Value* input = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &input));
 
@@ -201,7 +201,7 @@ bool GetSettingsFunction::RunWithStorage(ValueStore* storage) {
   }
 }
 
-bool GetBytesInUseSettingsFunction::RunWithStorage(ValueStore* storage) {
+bool StorageGetBytesInUseFunction::RunWithStorage(ValueStore* storage) {
   Value* input = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &input));
 
@@ -235,18 +235,18 @@ bool GetBytesInUseSettingsFunction::RunWithStorage(ValueStore* storage) {
   return true;
 }
 
-bool SetSettingsFunction::RunWithStorage(ValueStore* storage) {
+bool StorageSetFunction::RunWithStorage(ValueStore* storage) {
   DictionaryValue* input = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &input));
   return UseWriteResult(storage->Set(ValueStore::DEFAULTS, *input));
 }
 
-void SetSettingsFunction::GetQuotaLimitHeuristics(
+void StorageSetFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   GetModificationQuotaLimitHeuristics(heuristics);
 }
 
-bool RemoveSettingsFunction::RunWithStorage(ValueStore* storage) {
+bool StorageRemoveFunction::RunWithStorage(ValueStore* storage) {
   Value* input = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &input));
 
@@ -269,16 +269,16 @@ bool RemoveSettingsFunction::RunWithStorage(ValueStore* storage) {
   };
 }
 
-void RemoveSettingsFunction::GetQuotaLimitHeuristics(
+void StorageRemoveFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   GetModificationQuotaLimitHeuristics(heuristics);
 }
 
-bool ClearSettingsFunction::RunWithStorage(ValueStore* storage) {
+bool StorageClearFunction::RunWithStorage(ValueStore* storage) {
   return UseWriteResult(storage->Clear());
 }
 
-void ClearSettingsFunction::GetQuotaLimitHeuristics(
+void StorageClearFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   GetModificationQuotaLimitHeuristics(heuristics);
 }