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

Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it
was only run on IDL files. Clean up all the code which that simplifies.

TBR=isherman@chromium.org,battre@chromium.org,akalin@chromium.org
BUG=141318
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176015

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176236

[not at google - send to devlin, 2013-01-04 20:27:15]

Despite the terrifying size of this CL, it's actually basically just a gyp file
change with corresponding changes that were required to the schema bundle
compiler.

The rest of it was renames to put everything in the format that the schema
bundle compiler wants.

[Yoyo Zhou, 2013-01-04 23:54:33]

https://codereview.chromium.org/11747025/diff/41006/chrome/browser/extensions...
File chrome/browser/extensions/extension_function_registry.h (right):

https://codereview.chromium.org/11747025/diff/41006/chrome/browser/extensions...
chrome/browser/extensions/extension_function_registry.h:50: NOTREACHED() <<
"Function already registered for " << T::function_name();
This isn't going to work in multiprofile.

We're moving APIs to profile-keyed services that will also register their own
functions in some cases. Each time a profile is created, those services will try
to register with the EFR; right now, it depends on the idempotence of
registering functions.

One possible workaround is to make EFR also per-profile, but I don't see a
benefit from that.

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
File tools/json_schema_compiler/model.py (right):

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
tools/json_schema_compiler/model.py:140: available to.
nit: it bugs me that some of these end in . and some don't.

[not at google - send to devlin, 2013-01-05 00:15:36]

https://codereview.chromium.org/11747025/diff/41006/chrome/browser/extensions...
File chrome/browser/extensions/extension_function_registry.h (right):

https://codereview.chromium.org/11747025/diff/41006/chrome/browser/extensions...
chrome/browser/extensions/extension_function_registry.h:50: NOTREACHED() <<
"Function already registered for " << T::function_name();
On 2013/01/04 23:54:33, Yoyo Zhou wrote:
> This isn't going to work in multiprofile.
> 
> We're moving APIs to profile-keyed services that will also register their own
> functions in some cases. Each time a profile is created, those services will
try
> to register with the EFR; right now, it depends on the idempotence of
> registering functions.
> 
> One possible workaround is to make EFR also per-profile, but I don't see a
> benefit from that.

Done.

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
File tools/json_schema_compiler/model.py (right):

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
tools/json_schema_compiler/model.py:140: available to.
On 2013/01/04 23:54:33, Yoyo Zhou wrote:
> nit: it bugs me that some of these end in . and some don't.

ok

[not at google - send to devlin, 2013-01-07 18:31:13]

https://codereview.chromium.org/11747025/diff/38007/tools/json_schema_compile...
File tools/json_schema_compiler/model.py (right):

https://codereview.chromium.org/11747025/diff/38007/tools/json_schema_compile...
tools/json_schema_compiler/model.py:68: self.compiler_options =
json.get('compiler_options', {})
Antony -

How compatible is this with IDL? Does it need to be more structured, or have a
different format?

I ask because I can imagine that IDL files might also want to have a "compiler
options" section available to them - for example, we might want to add a
"custom_bindings_file" option so that we can generate the custom bindings
boilerplate.

[asargent_no_longer_on_chrome, 2013-01-07 20:09:31]

https://codereview.chromium.org/11747025/diff/38007/tools/json_schema_compile...
File tools/json_schema_compiler/model.py (right):

https://codereview.chromium.org/11747025/diff/38007/tools/json_schema_compile...
tools/json_schema_compiler/model.py:68: self.compiler_options =
json.get('compiler_options', {})
On 2013/01/07 18:31:13, kalman wrote:
> Antony -
> 
> How compatible is this with IDL? Does it need to be more structured, or have a
> different format?
> 
> I ask because I can imagine that IDL files might also want to have a "compiler
> options" section available to them - for example, we might want to add a
> "custom_bindings_file" option so that we can generate the custom bindings
> boilerplate.
> 

I think it should be ok. I've been trying to keep us as close to the evolving
WebIDL spec as practical (http://dev.w3.org/2006/webapi/WebIDL/), and where we
need something that can't directly be expressed to use "extended attributes"
(http://dev.w3.org/2006/webapi/WebIDL/#idl-extended-attributes). For instance,
we have [nodoc]. So you could do something like:

[compiler_options=[generate_type_functions,
implemented_in="chrome/browser/extensions/api/foo/foo.h"]]
namespace Foo {

};

[Yoyo Zhou, 2013-01-07 20:12:02]

LGTM from my side.

[not at google - send to devlin, 2013-01-09 17:30:48]

friendly ping

[asargent_no_longer_on_chrome, 2013-01-09 18:09:07]

Argh, sorry, I had begun to Publish/Mail Comments with LGTM the other day but I
guess I forgot to actually hit the Publish button. 

Anyhow, LGTM

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
File tools/json_schema_compiler/code.py (right):

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
tools/json_schema_compiler/code.py:17: def Append(self, line='',
substitute=True, indent=None):
would "indent_level" be a better name to more clearly convey the meaning of this
parameter?

[not at google - send to devlin, 2013-01-09 18:46:18]

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
File tools/json_schema_compiler/code.py (right):

https://codereview.chromium.org/11747025/diff/41006/tools/json_schema_compile...
tools/json_schema_compiler/code.py:17: def Append(self, line='',
substitute=True, indent=None):
On 2013/01/09 18:09:07, Antony Sargent wrote:
> would "indent_level" be a better name to more clearly convey the meaning of
this
> parameter?

Done.

[commit-bot: I haz the power, 2013-01-09 18:50:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/29351

[commit-bot: I haz the power, 2013-01-09 19:30:50]

Retried try job too often on linux_rel for step(s) interactive_ui_tests

[commit-bot: I haz the power, 2013-01-09 19:47:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/29360

[commit-bot: I haz the power, 2013-01-09 21:06:03]

Retried try job too often on win_rel for step(s) interactive_ui_tests

[commit-bot: I haz the power, 2013-01-09 21:20:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/58174

[commit-bot: I haz the power, 2013-01-10 00:20:02]

Failed to apply patch for
chrome/browser/extensions/extension_function_registry.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/extensions/extension_function_registry.cc
  Hunk #2 FAILED at 34.
  Hunk #11 succeeded at 227 with fuzz 2.
  1 out of 12 hunks FAILED -- saving rejects to file
chrome/browser/extensions/extension_function_registry.cc.rej

Patch:       chrome/browser/extensions/extension_function_registry.cc
Index: chrome/browser/extensions/extension_function_registry.cc
diff --git a/chrome/browser/extensions/extension_function_registry.cc
b/chrome/browser/extensions/extension_function_registry.cc
index
8979d30c31140b905feffe636de89d62cd159ff3..183f85ce876522cb8cd8f85632ddb6ee4d58bcf0
100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -7,44 +7,23 @@
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/extensions/api/app/app_api.h"
 #include
"chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
-#include "chrome/browser/extensions/api/bookmarks/bookmark_api.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
-#include
"chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h"
 #include "chrome/browser/extensions/api/commands/commands.h"
-#include
"chrome/browser/extensions/api/content_settings/content_settings_api.h"
-#include "chrome/browser/extensions/api/context_menu/context_menu_api.h"
-#include "chrome/browser/extensions/api/cookies/cookies_api.h"
-#include "chrome/browser/extensions/api/debugger/debugger_api.h"
-#include "chrome/browser/extensions/api/declarative/declarative_api.h"
 #include
"chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h"
 #include
"chrome/browser/extensions/api/extension_action/extension_page_actions_api.h"
 #include
"chrome/browser/extensions/api/extension_action/extension_script_badge_api.h"
-#include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
-#include "chrome/browser/extensions/api/history/history_api.h"
-#include "chrome/browser/extensions/api/identity/identity_api.h"
-#include "chrome/browser/extensions/api/i18n/i18n_api.h"
 #include "chrome/browser/extensions/api/idle/idle_api.h"
 #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h"
-#include "chrome/browser/extensions/api/management/management_api.h"
 #include "chrome/browser/extensions/api/metrics/metrics.h"
 #include "chrome/browser/extensions/api/module/module.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
-#include "chrome/browser/extensions/api/page_capture/page_capture_api.h"
-#include "chrome/browser/extensions/api/permissions/permissions_api.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
-#include "chrome/browser/extensions/api/record/record_api.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
-#include "chrome/browser/extensions/api/serial/serial_api.h"
-#include "chrome/browser/extensions/api/socket/socket_api.h"
-#include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h"
-#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/api/top_sites/top_sites_api.h"
-#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include
"chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
 #include
"chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
-#include "chrome/browser/extensions/settings/settings_api.h"
 #include "chrome/browser/extensions/system/system_api.h"
 #include "chrome/browser/infobars/infobar_extension_api.h"
 #include "chrome/browser/rlz/rlz_extension_api.h"
@@ -55,18 +34,17 @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/extensions/api/input/input.h"
-#endif
+#endif  // defined(TOOLKIT_VIEWS)
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
-#include "chrome/browser/chromeos/extensions/file_browser_handler_api.h"
 #include "chrome/browser/chromeos/extensions/info_private_api.h"
 #include "chrome/browser/chromeos/extensions/input_method_api.h"
 #include "chrome/browser/chromeos/extensions/power/power_api.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 #include "chrome/browser/chromeos/media/media_player_extension_api.h"
 #include "chrome/browser/extensions/api/terminal/terminal_private_api.h"
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 // static
 ExtensionFunctionRegistry* ExtensionFunctionRegistry::GetInstance() {
@@ -85,33 +63,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
 
   // Register all functions here.
 
-  // Windows
-  RegisterFunction<GetWindowFunction>();
-  RegisterFunction<GetCurrentWindowFunction>();
-  RegisterFunction<GetLastFocusedWindowFunction>();
-  RegisterFunction<GetAllWindowsFunction>();
-  RegisterFunction<CreateWindowFunction>();
-  RegisterFunction<UpdateWindowFunction>();
-  RegisterFunction<RemoveWindowFunction>();
-
-  // Tabs
-  RegisterFunction<CaptureVisibleTabFunction>();
-  RegisterFunction<CreateTabFunction>();
-  RegisterFunction<DetectTabLanguageFunction>();
-  RegisterFunction<DuplicateTabFunction>();
-  RegisterFunction<GetAllTabsInWindowFunction>();
-  RegisterFunction<GetCurrentTabFunction>();
-  RegisterFunction<GetSelectedTabFunction>();
-  RegisterFunction<GetTabFunction>();
-  RegisterFunction<HighlightTabsFunction>();
-  RegisterFunction<MoveTabsFunction>();
-  RegisterFunction<QueryTabsFunction>();
-  RegisterFunction<ReloadTabFunction>();
-  RegisterFunction<RemoveTabsFunction>();
-  RegisterFunction<TabsExecuteScriptFunction>();
-  RegisterFunction<TabsInsertCSSFunction>();
-  RegisterFunction<UpdateTabFunction>();
-
   // Page Actions.
   RegisterFunction<EnablePageActionsFunction>();
   RegisterFunction<DisablePageActionsFunction>();
@@ -156,21 +107,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<RemovePasswordsFunction>();
   RegisterFunction<RemoveWebSQLFunction>();
 
-  // Bookmarks.
-  RegisterFunction<extensions::GetBookmarksFunction>();
-  RegisterFunction<extensions::GetBookmarkChildrenFunction>();
-  RegisterFunction<extensions::GetBookmarkRecentFunction>();
-  RegisterFunction<extensions::GetBookmarkTreeFunction>();
-  RegisterFunction<extensions::GetBookmarkSubTreeFunction>();
-  RegisterFunction<extensions::ImportBookmarksFunction>();
-  RegisterFunction<extensions::ExportBookmarksFunction>();
-  RegisterFunction<extensions::SearchBookmarksFunction>();
-  RegisterFunction<extensions::RemoveBookmarkFunction>();
-  RegisterFunction<extensions::RemoveTreeBookmarkFunction>();
-  RegisterFunction<extensions::CreateBookmarkFunction>();
-  RegisterFunction<extensions::MoveBookmarkFunction>();
-  RegisterFunction<extensions::UpdateBookmarkFunction>();
-
   // Infobars.
   RegisterFunction<ShowInfoBarFunction>();
 
@@ -187,22 +123,10 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<extensions::CanEditBookmarkManagerFunction>();
   RegisterFunction<extensions::CanOpenNewWindowsBookmarkFunction>();
 
-  // History
-  RegisterFunction<extensions::AddUrlHistoryFunction>();
-  RegisterFunction<extensions::DeleteAllHistoryFunction>();
-  RegisterFunction<extensions::DeleteRangeHistoryFunction>();
-  RegisterFunction<extensions::DeleteUrlHistoryFunction>();
-  RegisterFunction<extensions::GetMostVisitedHistoryFunction>();
-  RegisterFunction<extensions::GetVisitsHistoryFunction>();
-  RegisterFunction<extensions::SearchHistoryFunction>();
-
   // Idle
   RegisterFunction<extensions::IdleQueryStateFunction>();
   RegisterFunction<extensions::IdleSetDetectionIntervalFunction>();
 
-  // I18N.
-  RegisterFunction<GetAcceptLanguagesFunction>();
-
   // Metrics.
   RegisterFunction<extensions::MetricsRecordUserActionFunction>();
   RegisterFunction<extensions::MetricsRecordValueFunction>();
@@ -222,13 +146,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<RlzClearProductStateFunction>();
 #endif
 
-  // Cookies.
-  RegisterFunction<extensions::GetCookieFunction>();
-  RegisterFunction<extensions::GetAllCookiesFunction>();
-  RegisterFunction<extensions::SetCookieFunction>();
-  RegisterFunction<extensions::RemoveCookieFunction>();
-  RegisterFunction<extensions::GetAllCookieStoresFunction>();
-
   // Test.
   RegisterFunction<extensions::TestNotifyPassFunction>();
   RegisterFunction<extensions::TestFailFunction>();
@@ -238,10 +155,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<extensions::TestSendMessageFunction>();
   RegisterFunction<extensions::TestGetConfigFunction>();
 
-  // Record.
-  RegisterFunction<extensions::CaptureURLsFunction>();
-  RegisterFunction<extensions::ReplayURLsFunction>();
-
   // Accessibility.
   RegisterFunction<GetFocusedControlFunction>();
   RegisterFunction<SetAccessibilityEnabledFunction>();
@@ -257,12 +170,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   // Commands.
   RegisterFunction<GetAllCommandsFunction>();
 
-  // Context Menus.
-  RegisterFunction<extensions::CreateContextMenuFunction>();
-  RegisterFunction<extensions::UpdateContextMenuFunction>();
-  RegisterFunction<extensions::RemoveContextMenuFunction>();
-  RegisterFunction<extensions::RemoveAllContextMenusFunction>();
-
   // Omnibox.
   RegisterFunction<extensions::OmniboxSendSuggestionsFunction>();
   RegisterFunction<extensions::OmniboxSetDefaultSuggestionFunction>();
@@ -291,15 +198,6 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<extensions::GetPolicyFunction>();
   RegisterFunction<extensions::SetPolicyFunction>();
 
-  // Management.
-  RegisterFunction<…
(message too large)

[commit-bot: I haz the power, 2013-01-10 00:43:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/51026

[commit-bot: I haz the power, 2013-01-10 03:58:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/51026

[commit-bot: I haz the power, 2013-01-10 04:05:59]

Change committed as 176015

[commit-bot: I haz the power, 2013-01-10 21:00:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/11747025/52015