Closure compiler: Re-generate chrome.bookmarkManagerPrivate externs.

 - Modify js_externs_generator_test.py to add "@typedef {Object}"
 - Mark optional parameter as optional in bookmarks_manager_private.json
 - Move incorrectly placed annotation in c/b/r/bookmarks/store.js
 - Re-generate bookmark_manager_private.js and add a note at the top of
   that file, about manual edits required.

Bug: 717828,717827
Change-Id: I69639a800d7aabb1bbe5e8885efce487f9414409
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1499778Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637988}

chrome/browser/resources/bookmarks/store.js

@@ -9,8 +9,8 @@
  */
 
 cr.define('bookmarks', function() {
+  /** @extends {cr.ui.Store<BookmarksPageState>} */
   class Store extends cr.ui.Store {
-    /** @extends {cr.ui.Store<BookmarksPageState>} */
     constructor() {
       super(bookmarks.util.createEmptyState(), bookmarks.reduceAction);
     }

chrome/common/extensions/api/bookmark_manager_private.json

@@ -269,6 +269,7 @@
           },
           {
             "type": "function",
+            "optional": true,
             "name": "callback",
             "parameters": [
               {

third_party/closure_compiler/externs/bluetooth_private.js

@@ -9,7 +9,7 @@
 // Please run the closure compiler before committing changes.
 // See https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
 
-// IMPORTANT:
+// IMPORTANT NOTE: Work-around for crbug.com/543822
 // s/chrome.bluetoothPrivate.bluetooth.Device/chrome.bluetooth.Device/
 
 /** @fileoverview Externs generated from namespace: bluetoothPrivate */

tools/json_schema_compiler/js_externs_generator.py

@@ -133,7 +133,7 @@ class _Generator(object):
     elif is_constructor:
       c.Comment('@constructor', comment_prefix = '', wrap_indent=4)
       c.Comment('@private', comment_prefix = '', wrap_indent=4)
-    else:
+    elif js_type.jsexterns is None:
       self._AppendTypedef(c, js_type.properties)
 
     self._js_util.AppendSeeLink(c, self._namespace.name, 'type',
@@ -159,11 +159,13 @@ class _Generator(object):
   def _AppendTypedef(self, c, properties):
     """Given an OrderedDict of properties, Appends code containing a @typedef.
     """
-    if not properties: return
 
     c.Append('@typedef {')
-    self._js_util.AppendObjectDefinition(c, self._namespace.name, properties,
-                                         new_line=False)
+    if properties:
+        self._js_util.AppendObjectDefinition(
+                c, self._namespace.name, properties, new_line=False)
+    else:
+        c.Append('Object', new_line=False)
     c.Append('}', new_line=False)
 
   def _AppendFunction(self, c, function):

tools/json_schema_compiler/js_externs_generator_test.py

@@ -297,12 +297,19 @@ fake_json = """// Copyright 2014 The Chromium Authors. All rights reserved.
   {
     "namespace": "fakeJson",
     "description": "Fake JSON API Stuff",
-    "types": [ {
-      "id": "CrazyEnum",
-      "type": "string",
-      "enum": ["camelCaseEnum", "Non-Characters", "5NumFirst", \
+    "types": [
+      {
+        "id": "CrazyEnum",
+        "type": "string",
+        "enum": ["camelCaseEnum", "Non-Characters", "5NumFirst", \
 "3Just-plainOld_MEAN"]
-    } ],
+      },
+      {
+        "id": "CrazyObject",
+        "type": "object",
+        "additionalProperties": {"type": "string"}
+      }
+    ],
     "functions": [ {
       "name": "funcWithInlineObj",
       "type": "function",
@@ -392,6 +399,12 @@ chrome.fakeJson.CrazyEnum = {
   _3JUST_PLAIN_OLD_MEAN: '3Just-plainOld_MEAN',
 };
 
+/**
+ * @typedef {Object}
+ * @see https://developer.chrome.com/extensions/fakeJson#type-CrazyObject
+ */
+chrome.fakeJson.CrazyObject;
+
 /**
  * @param {{
  *   foo: (boolean|undefined),