Start the process of renaming ui_unittests to ui_base_unittests.

ui/resources/ui_resources.gyp

 # Copyright 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.
 
 {
   'targets': [
     {
       # GN version: //ui/resources
       'target_name': 'ui_resources',
       'type': 'none',
@@ skipping 97 matching lines @@
               ],
               'action': [
                 'python',
                 '../../build/cp.py',
                 '<@(_inputs)',
                 '<@(_outputs)'
               ],
             },
           ],
         }],
+        ['OS == "android"', {
+          'actions': [
+            {
+              'action_name': 'copy_en_US_pak',
+              'message': 'Copying en-US.pak into locales/',
+              'inputs': [
+                '<(PRODUCT_DIR)/ui/en-US.pak',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/locales/en-US.pak',

[tfarina, 2014/09/22 02:34:55]

I'm hoping this will address -> crbug.com/374490. +Tony for this!

[tony, 2014/09/22 16:20:50]

Won't this get clobbered by the en-US.pak that is created by chrome_resources
since they both point to the same output file?  Why does the test apk try to
read locales/en-US.pak instead of locales/ui/en-US.pak.

We should probably split this into a separate change.

[tfarina, 2014/09/22 17:17:15]

Tony, Chris, could this being caused by
https://code.google.com/p/chromium/codesearch#chromium/src/ui/base/ui_base_te...

From my understanding of
https://code.google.com/p/chromium/codesearch#chromium/src/ui/base/ui_base_pa...,
DIR_LOCALES on Android won't be out/Debug/locales/en-US.pak.
Yeah, I was thinking on that. The fix to the clobber issue on Android deserves a
separate CL.

+              ],

[tfarina, 2014/09/22 03:20:07]

It seems to have fixed it:

http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...

+              'action': [
+                'python',
+                '../../build/cp.py',
+                '<@(_inputs)',
+                '<@(_outputs)'
+              ],
+            },
+          ],
+        }],
       ],
     },
   ],
 }