Make browsing_data component a layered component

components/browsing_data.gypi

Index: components/browsing_data.gypi
diff --git a/components/browsing_data.gypi b/components/browsing_data.gypi
index 074e603572f11dc86b4892cda9863f1ca11cd69a..f30819b1f2cac5a3a36e634e1786bf3c282a4f16 100644
--- a/components/browsing_data.gypi
+++ b/components/browsing_data.gypi
@@ -5,28 +5,23 @@
 {
   'targets': [
     {
-      'target_name': 'browsing_data',
+      # GN version: //components/browsing_data/core
+      'target_name': 'browsing_data_core',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../content/content.gyp:content_browser',
-        '../net/net.gyp:net',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'browsing_data/browsing_data_utils.cc',
-        'browsing_data/browsing_data_utils.h',
-        'browsing_data/conditional_cache_deletion_helper.cc',
-        'browsing_data/conditional_cache_deletion_helper.h',
-        'browsing_data/pref_names.cc',
-        'browsing_data/pref_names.h',
-        'browsing_data/storage_partition_http_cache_data_remover.cc',
-        'browsing_data/storage_partition_http_cache_data_remover.h',
-        'browsing_data/counters/browsing_data_counter.cc',
-        'browsing_data/counters/browsing_data_counter.h',
+        'browsing_data/core/browsing_data_utils.cc',
+        'browsing_data/core/browsing_data_utils.h',
+        'browsing_data/core/pref_names.cc',
+        'browsing_data/core/pref_names.h',
+        'browsing_data/core/counters/browsing_data_counter.cc',
+        'browsing_data/core/counters/browsing_data_counter.h',
       ],
     },
   ],
@@ -34,16 +29,39 @@
     ['OS == "android"', {
       'targets': [
         {
-          # GN: //components/browsing_data:browsing_data_utils_java
+          # GN: //components/browsing_data/core:browsing_data_utils_java
           'target_name': 'browsing_data_utils_java',
           'type': 'none',
           'variables': {
-            'source_file': 'components/browsing_data/browsing_data_utils.h',
+            'source_file': 'components/browsing_data/core/browsing_data_utils.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
-      ]
+      ],
     }],
-   ],
-
+    ['OS != "ios"', {
+      'targets': [
+        {
+          #GN version: //components/browsing_data/content
+          'target_name': 'browsing_data_content',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_browser',
+            '../net/net.gyp:net',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            # Note: sources list duplicated in GN build.
+            'browsing_data/content/conditional_cache_deletion_helper.cc',
+            'browsing_data/content/conditional_cache_deletion_helper.h',
+            'browsing_data/content/storage_partition_http_cache_data_remover.cc',
+            'browsing_data/content/storage_partition_http_cache_data_remover.h',
+          ],
+        },
+      ],
+    }],
+  ],
 }