Revert 276827 "readability review for luken"

ui/gfx/gfx.gyp

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 29 matching lines @@
         'geometry/quad_f.cc',
         'geometry/quad_f.h',
         'geometry/rect.cc',
         'geometry/rect.h',
         'geometry/rect_base.h',
         'geometry/rect_base_impl.h',
         'geometry/rect_conversions.cc',
         'geometry/rect_conversions.h',
         'geometry/rect_f.cc',
         'geometry/rect_f.h',
+        'geometry/r_tree.cc',
         'geometry/r_tree.h',
-        'geometry/r_tree_base.cc',
-        'geometry/r_tree_base.h',
         'geometry/safe_integer_conversions.h',
         'geometry/size.cc',
         'geometry/size.h',
         'geometry/size_base.h',
         'geometry/size_conversions.cc',
         'geometry/size_conversions.h',
         'geometry/size_f.cc',
         'geometry/size_f.h',
         'geometry/vector2d.cc',
         'geometry/vector2d.h',
@@ skipping 399 matching lines @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }