Abstract WebContents/NavigationController from core TabRestore code

components/sessions.gypi

 # Copyright 2013 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': {
     # Core sources shared by sessions_content and sessions_ios. These can't
     # be a separate shared library since one symbol is implemented higher up in
     # the sessions_content/ios layer.
     'sessions_core_sources': [
       'sessions/base_session_service.cc',
       'sessions/base_session_service.h',
       'sessions/base_session_service_commands.cc',
       'sessions/base_session_service_commands.h',
       'sessions/base_session_service_delegate.h',
+      'sessions/core/open_tab.h',
       'sessions/core/serialized_navigation_driver.h',
       'sessions/core/session_constants.cc',
       'sessions/core/session_constants.h',
       'sessions/core/tab_restore_service_client.cc',
       'sessions/core/tab_restore_service_client.h',
       'sessions/serialized_navigation_entry.cc',
       'sessions/serialized_navigation_entry.h',
       'sessions/session_backend.cc',
       'sessions/session_backend.h',
       'sessions/session_command.cc',
@@ skipping 35 matching lines @@
     },
   ],
 
   # Platform-specific targets.
   'conditions': [
     ['OS!="ios"', {
       'targets': [
         {
           # GN version: //components/sessions
           'target_name': 'sessions_content',
-          'type': '<(component)',
+          'type': 'static_library',

[blundell, 2015/09/16 16:20:36]

You can ignore this; it's a temporary workaround for the WebContentsUserData
issue I described in my chromium-dev@ email. I'll fix it one way or another
before landing.

           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../content/content.gyp:content_browser',
             '../skia/skia.gyp:skia',
             '../sync/sync.gyp:sync',
             '../third_party/protobuf/protobuf.gyp:protobuf_lite',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../url/url.gyp:url_lib',
           ],
           'include_dirs': [
             '..',
           ],
           'defines': [
             'SESSIONS_IMPLEMENTATION',
           ],
           'sources': [
             # Note: sources list duplicated in GN build.
             '<@(sessions_core_sources)',
 
+            'sessions/content/content_open_tab.cc',
+            'sessions/content/content_open_tab.h',
             'sessions/content/content_serialized_navigation_builder.cc',
             'sessions/content/content_serialized_navigation_builder.h',
             'sessions/content/content_serialized_navigation_driver.cc',
             'sessions/content/content_serialized_navigation_driver.h',
             'sessions/content/content_tab_client_data.cc',
             'sessions/content/content_tab_client_data.h',
           ],
         },
       ],
     }, {  # OS==ios
@@ skipping 23 matching lines @@
             'sessions/ios/ios_serialized_navigation_builder.h',
             'sessions/ios/ios_serialized_navigation_driver.cc',
             'sessions/ios/ios_serialized_navigation_driver.h',
           ],
         },
       ],
     }],
   ],
 
 }