Improve spec style and minor changes

pkg/analysis_server/test/integration/protocol_matchers.dart

Index: pkg/analysis_server/test/integration/protocol_matchers.dart
diff --git a/pkg/analysis_server/test/integration/protocol_matchers.dart b/pkg/analysis_server/test/integration/protocol_matchers.dart
index dd107d648c5c7aafab9594022c1d5a3bf965a797..c7cbce15d69e13c65828ec7d0bc239d804156c3a 100644
--- a/pkg/analysis_server/test/integration/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/protocol_matchers.dart
@@ -806,8 +806,6 @@ final Matcher isAnalysisError = new MatchesJsonObject(
  * AnalysisOptions
  *
  * {
- *   "analyzeAngular": optional bool
- *   "analyzePolymer": optional bool
  *   "enableAsync": optional bool
  *   "enableDeferredLoading": optional bool
  *   "enableEnums": optional bool
@@ -817,8 +815,6 @@ final Matcher isAnalysisError = new MatchesJsonObject(
  */
 final Matcher isAnalysisOptions = new MatchesJsonObject(
   "AnalysisOptions", null, optionalFields: {
-    "analyzeAngular": isBool,
-    "analyzePolymer": isBool,
     "enableAsync": isBool,
     "enableDeferredLoading": isBool,
     "enableEnums": isBool,
@@ -867,17 +863,13 @@ final Matcher isAnalysisStatus = new MatchesJsonObject(
  *
  * {
  *   "type": "change"
- *   "offset": int
- *   "length": int
- *   "replacement": String
+ *   "edits": List<SourceEdit>
  * }
  */
 final Matcher isChangeContentOverlay = new MatchesJsonObject(
   "ChangeContentOverlay", {
     "type": equals("change"),
-    "offset": isInt,
-    "length": isInt,
-    "replacement": isString
+    "edits": isListOf(isSourceEdit)
   });
 
 /**