views: Split test_support_views in two targets.

views: Split test_support_views in two targets.

One with content dep and one without.

BUG=141187
R=ben@chromium.org
TBR=jam@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=161810

[Ben Goodger (Google), 2012-10-12 17:51:27]

lgtm


On Fri, Oct 12, 2012 at 10:21 AM, <tfarina@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> views: Split test_support_views in two targets.
>
> One with content dep and one without.
>
> BUG=141187
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/11117009/<http://codereview.chromium.org/111...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M ash/ash.gyp
>   M chrome/chrome_tests.gypi
>   M content/content_shell.gypi
>   M ui/app_list/app_list.gyp
>   M ui/views/views.gyp
>
>
> Index: ash/ash.gyp
> diff --git a/ash/ash.gyp b/ash/ash.gyp
> index fcc1553ed1dddc2d05d3364bbcfa7d**049f8fdda6..**
> 8e96c05875e3be5a87831766106a9e**539e9fd1c2 100644
> --- a/ash/ash.gyp
> +++ b/ash/ash.gyp
> @@ -485,7 +485,7 @@
>          '../ui/ui.gyp:ui_test_support'**,
>          '../ui/views/views.gyp:views',
>          '../ui/views/views.gyp:views_**examples_with_content_lib',
> -        '../ui/views/views.gyp:test_**support_views',
> +        '../ui/views/views.gyp:views_**with_content_test_support',
>          'ash',
>          'ash_resources',
>          'test_support_ash',
> @@ -615,7 +615,7 @@
>          '../ui/ui.gyp:ui_resources',
>          '../ui/views/views.gyp:views',
>          '../ui/views/views.gyp:views_**examples_with_content_lib',
> -        '../ui/views/views.gyp:test_**support_views',
> +        '../ui/views/views.gyp:views_**test_support',
>          'ash',
>          'ash_resources',
>        ],
> Index: chrome/chrome_tests.gypi
> diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
> index a3a6d8d38aa1259ff7632359a6b44f**cdc91e83a3..**
> 8f767a34dd3819a1f154675389039f**1b796db1e7 100644
> --- a/chrome/chrome_tests.gypi
> +++ b/chrome/chrome_tests.gypi
> @@ -593,7 +593,7 @@
>          ['toolkit_views==1', {
>            'dependencies': [
>              '../ui/views/views.gyp:views',
> -            '../ui/views/views.gyp:test_**support_views',
> +            '../ui/views/views.gyp:views_**test_support',
>            ],
>          }],
>          ['chromeos==1', {
> Index: content/content_shell.gypi
> diff --git a/content/content_shell.gypi b/content/content_shell.gypi
> index 347d523b08f01ab0879af86a58d8da**bbead95ef6..**
> a628bff8ec56c07bc54ed65a385097**82cd9c9e8d 100644
> --- a/content/content_shell.gypi
> +++ b/content/content_shell.gypi
> @@ -175,7 +175,7 @@
>              '../ui/base/strings/ui_**strings.gyp:ui_strings',
>              '../ui/views/controls/webview/**webview.gyp:webview',
>              '../ui/views/views.gyp:views',
> -            '../ui/views/views.gyp:test_**support_views',
> +            '../ui/views/views.gyp:views_**test_support',
>              '../ui/ui.gyp:ui_resources',
>            ],
>            'sources/': [
> Index: ui/app_list/app_list.gyp
> diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
> index e591b2eca5515d5e69cda628ee6125**9785fb783b..**
> 5043550279bc2bfb266e9a36536154**faaa115955 100644
> --- a/ui/app_list/app_list.gyp
> +++ b/ui/app_list/app_list.gyp
> @@ -75,7 +75,7 @@
>          '../compositor/compositor.gyp:**compositor',
>          '../compositor/compositor.gyp:**compositor_test_support',
>          '../views/views.gyp:views',
> -        '../views/views.gyp:test_**support_views',
> +        '../views/views.gyp:views_**test_support',
>          'app_list',
>        ],
>        'sources': [
> Index: ui/views/views.gyp
> diff --git a/ui/views/views.gyp b/ui/views/views.gyp
> index c9fc50100b032ec8387699dea87ab3**119c4c7dab..**
> 9e4959f21a0d3ffc0ee4fc406c7498**2cc67145e8 100644
> --- a/ui/views/views.gyp
> +++ b/ui/views/views.gyp
> @@ -504,17 +504,14 @@
>        ],
>      }, # target_name: views
>      {
> -      'target_name': 'test_support_views',
> +      'target_name': 'views_test_support',
>        'type': 'static_library',
>        'dependencies': [
>          '../../base/base.gyp:base',
> -        '../../content/content.gyp:**content',
> -        '../../content/content.gyp:**test_support_content',
>          '../../ipc/ipc.gyp:test_**support_ipc',
>          '../../skia/skia.gyp:skia',
>          '../../testing/gtest.gyp:**gtest',
>          '../ui.gyp:ui',
> -        'controls/webview/webview.gyp:**webview',
>          'views',
>        ],
>        'include_dirs': [
> @@ -525,10 +522,31 @@
>          'test/test_views_delegate.h',
>          'test/views_test_base.cc',
>          'test/views_test_base.h',
> +      ],
> +    },  # target_name: views_test_support
> +    {
> +      'target_name': 'views_with_content_test_**support',
> +      'type': 'static_library',
> +      'dependencies': [
> +        '../../base/base.gyp:base',
> +        '../../content/content.gyp:**content',
> +        '../../content/content.gyp:**test_support_content',
> +        '../../ipc/ipc.gyp:test_**support_ipc',
> +        '../../skia/skia.gyp:skia',
> +        '../../testing/gtest.gyp:**gtest',
> +        '../ui.gyp:ui',
> +        'controls/webview/webview.gyp:**webview',
> +        'views_test_support',
> +        'views',
> +      ],
> +      'include_dirs': [
> +        '..',
> +      ],
> +      'sources': [
>          'test/webview_test_helper.cc',
>          'test/webview_test_helper.h',
>        ],
> -    },  # target_name: test_support_views
> +    },  # target_name: views_with_content_test_**support
>      {
>        'target_name': 'views_unittests',
>        'type': 'executable',
> @@ -551,8 +569,8 @@
>          '../ui.gyp:ui',
>          '../ui.gyp:ui_resources',
>          '../ui.gyp:ui_test_support',
> -        'test_support_views',
>          'views',
> +        'views_test_support',
>        ],
>        'include_dirs': [
>          '..',
>
>
>