Stop using Element.unit directly.

pkg/analysis_server/lib/src/services/refactoring/refactoring.dart

Index: pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
index 5cf982fbc530c33e78ba92c3fe4afeaad555e4fe..9c2da5d715f12568d664a332e44f0ae88a316efd 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
@@ -31,6 +31,11 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
+ * Completes with the resolved [CompilationUnit] that contains the [element].
+ */
+typedef Future<CompilationUnit> GetResolvedUnit(Element element);
+
+/**
  * [Refactoring] to convert getters into normal [MethodDeclaration]s.
  */
 abstract class ConvertGetterToMethodRefactoring implements Refactoring {
@@ -52,9 +57,10 @@ abstract class ConvertMethodToGetterRefactoring implements Refactoring {
    * Returns a new [ConvertMethodToGetterRefactoring] instance for converting
    * [element] and all the corresponding hierarchy elements.
    */
-  factory ConvertMethodToGetterRefactoring(
-      SearchEngine searchEngine, ExecutableElement element) {
-    return new ConvertMethodToGetterRefactoringImpl(searchEngine, element);
+  factory ConvertMethodToGetterRefactoring(SearchEngine searchEngine,
+      GetResolvedUnit getResolvedUnit, ExecutableElement element) {
+    return new ConvertMethodToGetterRefactoringImpl(
+        searchEngine, getResolvedUnit, element);
   }
 }
 
@@ -248,11 +254,8 @@ abstract class InlineMethodRefactoring implements Refactoring {
   /**
    * Returns a new [InlineMethodRefactoring] instance.
    */
-  factory InlineMethodRefactoring(
-      SearchEngine searchEngine,
-      GetResolvedUnitContainingElement getResolvedUnit,
-      CompilationUnit unit,
-      int offset) {
+  factory InlineMethodRefactoring(SearchEngine searchEngine,
+      GetResolvedUnit getResolvedUnit, CompilationUnit unit, int offset) {
     return new InlineMethodRefactoringImpl(
         searchEngine, getResolvedUnit, unit, offset);
   }