Refactor and simplify the dart2dart renamer.

tests/compiler/dart2js/backend_dart/dart_backend_test.dart

Index: tests/compiler/dart2js/backend_dart/dart_backend_test.dart
diff --git a/tests/compiler/dart2js/backend_dart/dart_backend_test.dart b/tests/compiler/dart2js/backend_dart/dart_backend_test.dart
index 1af28e2f3fafd54534f65c7fb1ded0c92eef8c5f..b461e39ba56b34bbfba32f4093e669840bc81122 100644
--- a/tests/compiler/dart2js/backend_dart/dart_backend_test.dart
+++ b/tests/compiler/dart2js/backend_dart/dart_backend_test.dart
@@ -341,26 +341,26 @@ class A {
   foo() {}
   static const field = 5;
 }
-A_globalfoo() {}
-var A_globalVar;
-var A_globalVarInitialized = 6;
-var A_globalVarInitialized2 = 7;
+globalfoo_A() {}
+var globalVar_A;
+var globalVarInitialized_A = 6;
+var globalVarInitialized2_A = 7;
 class A_A {
   A_A() {}
-  A_A.A_fromFoo() {}
-  static A_staticfoo() {}
+  A_A.fromFoo_A() {}
+  static staticfoo_A() {}
   foo() {}
-  static const A_field = 5;
+  static const field_A = 5;
 }
 main() {
-  A_globalVar;
-  A_globalVarInitialized;
-  A_globalVarInitialized2;
-  A_globalfoo();
-  A_A.A_field;
-  A_A.A_staticfoo();
+  globalVar_A;
+  globalVarInitialized_A;
+  globalVarInitialized2_A;
+  globalfoo_A();
+  A_A.field_A;
+  A_A.staticfoo_A();
   new A_A();
-  new A_A.A_fromFoo();
+  new A_A.fromFoo_A();
   new A_A().foo();
   globalVar;
   globalVarInitialized;
@@ -497,7 +497,7 @@ topfoo() {}
 class A {
   foo() {}
 }
-A_topfoo() {
+topfoo_A() {
   var x = 5;
 }
 class A_A {
@@ -515,7 +515,7 @@ main() {
   var GREATVAR = b.myliba;
   b.mylist;
   a = getA();
-  A_topfoo();
+  topfoo_A();
   topfoo();
 }
 ''';
@@ -565,11 +565,11 @@ main() {
   var expectedResult = '''
 get topgetset => 5;
 set topgetset(arg) {}
-get A_topgetset => 6;
-set A_topgetset(arg) {}
+get topgetset_A => 6;
+set topgetset_A(arg) {}
 main() {
-  A_topgetset;
-  A_topgetset = 6;
+  topgetset_A;
+  topgetset_A = 6;
   topgetset;
   topgetset = 5;
 }
@@ -663,17 +663,17 @@ class B<T> {}
 class A<T> extends B<T> {
   T f;
 }
-typedef void A_MyFunction<A_T extends num>(A_T arg);
-class A_T {}
-class A_B<A_T> {}
-class A_A<A_T> extends A_B<A_T> {
-  A_T f;
+typedef void MyFunction_A<T_A extends num>(T_A arg);
+class T_A {}
+class B_A<T_A> {}
+class A_A<T_A> extends B_A<T_A> {
+  T_A f;
 }
 main() {
-  A_MyFunction myf1;
+  MyFunction_A myf1;
   MyFunction myf2;
   new A_A<int>().f;
-  new A_T();
+  new T_A();
   new A<int>().f;
   new T();
 }
@@ -704,8 +704,8 @@ main() {
   var expectedResult = '''
 class I {}
 class A<T extends I> {}
-class A_I {}
-class A_A<A_T extends A_I> {}
+class I_A {}
+class A_A<T_A extends I_A> {}
 main() {
   new A_A();
   new A();
@@ -727,9 +727,9 @@ main() {
 }
 ''';
   var expectedResult = '''
-A_main() {}
+main_A() {}
 main() {
-  A_main();
+  main_A();
 }
 ''';
   testDart2DartWithLibrary(mainSrc, librarySrc,
@@ -745,9 +745,9 @@ main() {
 }
 ''';
   var expectedResult = '''
-import "dart:io" as p;
+import "dart:io";
 main() {
-  p.Platform.operatingSystem;
+  Platform.operatingSystem;
 }
 ''';
   testDart2Dart(src,
@@ -851,12 +851,12 @@ main() {
 }
 ''';
   var expectedResult = '''
-import "dart:html" as p;
+import "dart:html";
 class A {
-  static String get A_userAgent => p.window.navigator.userAgent;
+  static String get userAgent_A => window.navigator.userAgent;
 }
 main() {
-  A.A_userAgent;
+  A.userAgent_A;
 }
 ''';
   testDart2Dart(src,
@@ -875,12 +875,12 @@ main() {
 }
 ''';
   var expectedResult = """
-A_print(x) {
+print_A(x) {
   throw 'fisk';
 }
 main() {
   print('corelib');
-  A_print('local');
+  print_A('local');
 }
 """;
   testDart2Dart(src,
@@ -904,7 +904,7 @@ class A {
 }
 main() {
   new A();
-  new A_Unresolved();
+  new Unresolved_A();
 }
 """;
   testDart2Dart(src,