Move UserInfo to user_manager.

components/user_manager.gypi

 # Copyright 2014 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': {
+    # Cross-platform user_manager sources.
+    'user_manager_shared_sources': [
+      'user_manager/user_info.h',
+    ],
+    # Chrome OS user_manager sources.
+    'user_manager_chromeos_sources': [
+      'user_manager/user_type.h',
+      'user_manager/user_manager_export.h',

[blundell, 2014/07/09 12:23:49]

this should be under shared sources, no?

[Nikita (slow), 2014/07/09 12:40:16]

Done.

+    ],
+  },
   'targets': [{
     'target_name': 'user_manager',
     'type': '<(component)',
     'dependencies': [
       '../base/base.gyp:base',
     ],
     'defines': [
       'USER_MANAGER_IMPLEMENTATION',
     ],
     'include_dirs': [
       '..',
     ],
-    'sources': [
-      'user_manager/user_type.h',
-      'user_manager/user_manager_export.h',
+    'conditions': [
+      ['use_ash==1', {

[blundell, 2014/07/09 12:23:49]

is this condition necessary when the gypi is only include when use_ash==1?

[Nikita (slow), 2014/07/09 12:40:15]

I was not sure where to leave this use_ash condition, removing from this file.

+        'sources': [ '<@(user_manager_shared_sources)' ],
+        'conditions': [
+          ['chromeos == 1', {
+            'sources': [ '<@(user_manager_chromeos_sources)' ],
+          }],
+        ],
+      }],
     ],
   }],
 }