Move UserInfo to user_manager.

components/user_manager.gypi

Index: components/user_manager.gypi
diff --git a/components/user_manager.gypi b/components/user_manager.gypi
index d63f37823f7e0ce1ed0d50b0e37f54ba6fd7152b..ddec62e8e806c35e2691dd56357e7aaf72ef4e95 100644
--- a/components/user_manager.gypi
+++ b/components/user_manager.gypi
@@ -3,6 +3,17 @@
 # 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)',
@@ -15,9 +26,15 @@
     '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)' ],
+          }],
+        ],
+      }],
     ],
   }],
 }