Added ThisVariable in scoping and the captured scope of initialized fields.

pkg/compiler/lib/src/kernel/kernel_strategy.dart

Index: pkg/compiler/lib/src/kernel/kernel_strategy.dart
diff --git a/pkg/compiler/lib/src/kernel/kernel_strategy.dart b/pkg/compiler/lib/src/kernel/kernel_strategy.dart
index 2662ead2caf37009c01041fd77b5732c23e1b757..7c228f19910475fbfb8a53ed4a179deb0083d00b 100644
--- a/pkg/compiler/lib/src/kernel/kernel_strategy.dart
+++ b/pkg/compiler/lib/src/kernel/kernel_strategy.dart
@@ -25,7 +25,7 @@ import '../js_backend/mirrors_data.dart';
 import '../js_backend/native_data.dart';
 import '../js_backend/no_such_method_registry.dart';
 import '../js_backend/runtime_types.dart';
-import '../js_model/closure.dart' show ClosureModel;
+import '../js_model/closure.dart' show ScopeModel;
 import '../library_loader.dart';
 import '../native/enqueue.dart' show NativeResolutionEnqueuer;
 import '../native/resolver.dart';
@@ -47,8 +47,8 @@ class KernelFrontEndStrategy extends FrontendStrategyBase {
 
   KernelAnnotationProcessor _annotationProcesser;
 
-  final Map<MemberEntity, ClosureModel> closureModels =
-      <MemberEntity, ClosureModel>{};
+  final Map<MemberEntity, ScopeModel> closureModels =
+      <MemberEntity, ScopeModel>{};
 
   KernelFrontEndStrategy(
       this._options, DiagnosticReporter reporter, env.Environment environment) {
@@ -155,7 +155,7 @@ class KernelWorkItemBuilder implements WorkItemBuilder {
   final KernelToElementMapForImpactImpl _elementMap;
   final ImpactTransformer _impactTransformer;
   final NativeMemberResolver _nativeMemberResolver;
-  final Map<MemberEntity, ClosureModel> closureModels;
+  final Map<MemberEntity, ScopeModel> closureModels;
 
   KernelWorkItemBuilder(
       this._elementMap,
@@ -178,7 +178,7 @@ class KernelWorkItem implements ResolutionWorkItem {
   final ImpactTransformer _impactTransformer;
   final NativeMemberResolver _nativeMemberResolver;
   final MemberEntity element;
-  final Map<MemberEntity, ClosureModel> closureModels;
+  final Map<MemberEntity, ScopeModel> closureModels;
 
   KernelWorkItem(this._elementMap, this._impactTransformer,
       this._nativeMemberResolver, this.element, this.closureModels);
@@ -187,7 +187,7 @@ class KernelWorkItem implements ResolutionWorkItem {
   WorldImpact run() {
     _nativeMemberResolver.resolveNativeMember(element);
     ResolutionImpact impact = _elementMap.computeWorldImpact(element);
-    ClosureModel closureModel = _elementMap.computeClosureModel(element);
+    ScopeModel closureModel = _elementMap.computeScopeModel(element);
     if (closureModel != null) {
       closureModels[element] = closureModel;
     }