Rename components's Encryptor to OSEncrypt.

components/encryptor.gypi

Index: components/encryptor.gypi
diff --git a/components/encryptor.gypi b/components/encryptor.gypi
index 3ddc7a132918ff3d8e1446f8a28f6d1d4df99818..f534a85eb40ffbbda32f32ad1682d73affe46b49 100644
--- a/components/encryptor.gypi
+++ b/components/encryptor.gypi
@@ -15,29 +15,29 @@
         '../crypto/crypto.gyp:crypto',
       ],
       'sources': [
-        'encryptor/encryptor.h',
-        'encryptor/encryptor_mac.mm',
-        'encryptor/encryptor_password_mac.h',
-        'encryptor/encryptor_password_mac.mm',
-        'encryptor/encryptor_posix.cc',
         'encryptor/encryptor_switches.cc',
         'encryptor/encryptor_switches.h',
-        'encryptor/encryptor_win.cc',
         'encryptor/ie7_password_win.cc',
         'encryptor/ie7_password_win.h',
+        'encryptor/keychain_password_mac.h',
+        'encryptor/keychain_password_mac.mm',
+        'encryptor/os_crypt.h',
+        'encryptor/os_crypt_mac.mm',
+        'encryptor/os_crypt_posix.cc',
+        'encryptor/os_crypt_win.cc',
       ],
       'conditions': [
         ['OS=="mac"', {
           'sources!': [
-            'encryptor/encryptor_posix.cc',
+            'encryptor/os_crypt_posix.cc',
           ],
         }],
       ],
       'target_conditions': [
         ['OS=="ios"', {
           'sources/': [
-            ['include', '^encryptor/encryptor_mac\\.mm$'],
-            ['include', '^encryptor/encryptor_password_mac\\.mm$'],
+            ['include', '^encryptor/keychain_password_mac\\.mm$'],
+            ['include', '^encryptor/os_crypt_mac\\.mm$'],
           ],
         }],
       ],