Revert 282355 "Add chrome/browser/ui to the GN build."

trunk/src/chrome/chrome_browser.gypi

 # Copyright 2012 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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2956 matching lines @@
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
             '../webkit/webkit_resources.gyp:webkit_resources',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',
 
             # These files are generated by GRIT.
             '<(grit_out_dir)/grit/component_extension_resources_map.cc',
             '<(grit_out_dir)/grit/theme_resources_map.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc',
 
             # This file is generated by
             # chrome/browser/metrics/variations/generate_resources_map.py
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/generated_resources_map.cc',
           ],
           'defines': [
             '<@(nacl_defines)',
           ],
           'direct_dependent_settings': {
             'defines': [
@@ skipping 598 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }