Use same proto for sync and local dom distiller data

This also adds a couple of useful functions for dealing with these protos
(comparison, conversion to/from EntitySpecifics, check validity). 

BUG=288015
TBR=tim@

Review URL: https://codereview.chromium.org/24240002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226749 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 59 insertions, 65 deletions

diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index d4f9f44..edfadd4 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -3,75 +3,69 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'dom_distiller_webui',
-      'type': 'static_library',
-      'dependencies': [
-        'component_strings.gyp:component_strings',
-        'dom_distiller_core',
-        'dom_distiller_resources',
-        '../base/base.gyp:base',
-        '../content/content.gyp:content_browser',
-        '../skia/skia.gyp:skia',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'dom_distiller/webui/dom_distiller_ui.cc',
-        'dom_distiller/webui/dom_distiller_ui.h',
-        'dom_distiller/webui/dom_distiller_handler.cc',
-        'dom_distiller/webui/dom_distiller_handler.h',
-      ],
-    },
-    {
-      'target_name': 'dom_distiller_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components',
-      },
-      'actions': [
+  'conditions': [
+    ['android_webview_build == 0', {
+      'targets': [
         {
-          'action_name': 'dom_distiller_resources',
+          'target_name': 'dom_distiller_webui',
+          'type': 'static_library',
+          'dependencies': [
+            'component_strings.gyp:component_strings',
+            'dom_distiller_core',
+            'dom_distiller_resources',
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_browser',
+            '../skia/skia.gyp:skia',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'dom_distiller/webui/dom_distiller_ui.cc',
+            'dom_distiller/webui/dom_distiller_ui.h',
+            'dom_distiller/webui/dom_distiller_handler.cc',
+            'dom_distiller/webui/dom_distiller_handler.h',
+          ],
+        },
+        {
+          'target_name': 'dom_distiller_resources',
+          'type': 'none',
           'variables': {
-            'grit_grd_file': 'dom_distiller_resources.grd',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'actions': [
+            {
+              'action_name': 'dom_distiller_resources',
+              'variables': {
+                'grit_grd_file': 'dom_distiller_resources.grd',
+              },
+              'includes': [ '../build/grit_action.gypi' ],
+            },
+          ],
+          'includes': [ '../build/grit_target.gypi' ],
+        },
+        {
+          'target_name': 'dom_distiller_core',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../sync/sync.gyp:sync',
+            '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+            '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            'dom_distiller/core/article_entry.cc',
+            'dom_distiller/core/article_entry.h',
+            'dom_distiller/core/dom_distiller_constants.cc',
+            'dom_distiller/core/dom_distiller_constants.h',
+            'dom_distiller/core/dom_distiller_database.cc',
+            'dom_distiller/core/dom_distiller_database.h',
+          ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'dom_distiller_core',
-      'type': 'static_library',
-      'dependencies': [
-        'dom_distiller_core_proto',
-        '../base/base.gyp:base',
-        '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'dom_distiller/core/dom_distiller_constants.cc',
-        'dom_distiller/core/dom_distiller_constants.h',
-        'dom_distiller/core/dom_distiller_database.cc',
-        'dom_distiller/core/dom_distiller_database.h',
-      ],
-    },
-    {
-      'target_name': 'dom_distiller_core_proto',
-      'type': 'static_library',
-      'sources': [
-        'dom_distiller/core/proto/article_entry.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'dom_distiller/core/proto',
-        'proto_out_dir': 'components/dom_distiller/core/proto',
-      },
-      'includes': [ '../build/protoc.gypi', ],
-    },
+    }],
   ],
 }