Reland of [Chromecast] Change chromecast_branding to public

chromecast/chromecast.gyp

 # Copyright 2014 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': {
     'android_support_v13_target%':
         '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
     'cast_build_release': 'internal/build/cast_build_release',
     'cast_is_debug_build%': 0,
     # Refers to enum CastProductType in components/metrics/proto/cast_logs.proto
     'cast_product_type%': 0,  # CAST_PRODUCT_TYPE_UNKNOWN
     'chromium_code': 1,
-    'chromecast_branding%': 'Chromium',
+    'chromecast_branding%': 'public',
     'disable_display%': 0,
     'enable_default_cast_graphics%': 1,
     'ozone_platform_cast%': 0,
     'use_chromecast_webui%': 0,
   },
   'includes': [
     'chromecast_tests.gypi',
   ],
   'target_defaults': {
     'include_dirs': [
@@ skipping 190 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
             ],
             'conditions': [
-              ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
+              ['chromecast_branding!="public" and use_chromecast_webui==1', {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pak',
                 ],
               }],
             ],
             'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
       'conditions': [
-        ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
+        ['chromecast_branding!="public" and use_chromecast_webui==1', {
           'dependencies': [
             'internal/chromecast_resources.gyp:chromecast_app_resources',
             'internal/chromecast_resources.gyp:chromecast_webui_resources',
           ],
         }],
       ],
     },  # end of target 'cast_shell_pak'
     # This target contains all content-embedder implementation that is
     # non-platform-specific.
     {
@@ skipping 97 matching lines @@
         'renderer/cast_media_load_deferrer.cc',
         'renderer/cast_media_load_deferrer.h',
         'renderer/cast_render_process_observer.cc',
         'renderer/cast_render_process_observer.h',
         'renderer/key_systems_cast.cc',
         'renderer/key_systems_cast.h',
         'renderer/media/capabilities_message_filter.cc',
         'renderer/media/capabilities_message_filter.h',
       ],
       'conditions': [
-        ['chromecast_branding=="Chrome"', {
+        ['chromecast_branding!="public"', {
           'dependencies': [
             'internal/chromecast_internal.gyp:cast_shell_internal',
           ],
         }, {
           'sources': [
             'browser/cast_content_browser_client_simple.cc',
             'browser/cast_network_delegate_simple.cc',
             'browser/devtools/remote_debugging_server_simple.cc',
             'browser/metrics/platform_metrics_providers_simple.cc',
             'browser/pref_service_helper_simple.cc',
@@ skipping 47 matching lines @@
         'base/cast_sys_info_dummy.h',
         'base/cast_sys_info_android.cc',
         'base/cast_sys_info_android.h',
       ],
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
             'cast_jni_headers',
           ],
         }],
-        ['chromecast_branding!="Chrome" and OS!="android"', {
+        ['chromecast_branding=="public" and OS!="android"', {
           'sources': [
             'base/cast_sys_info_util_simple.cc',
           ],
         }],
       ],
     },  # end of target 'cast_sys_info'
     {
       'target_name': 'cast_version_header',
       'type': 'none',
       'direct_dependent_settings': {
@@ skipping 74 matching lines @@
           ],
           'sources': [
             'android/cast_jni_registrar.cc',
             'android/cast_jni_registrar.h',
             'android/cast_metrics_helper_android.cc',
             'android/cast_metrics_helper_android.h',
             'android/platform_jni_loader.h',
             'app/android/cast_jni_loader.cc',
           ],
           'conditions': [
-            ['chromecast_branding=="Chrome"', {
+            ['chromecast_branding!="public"', {
               'dependencies': [
                 'internal/chromecast_internal.gyp:cast_shell_android_internal'
               ],
             }, {
               'sources': [
                 'android/platform_jni_loader_stub.cc',
               ],
             }]
           ],
         },  # end of target 'libcast_shell_android'
@@ skipping 180 matching lines @@
           'sources': [
             'graphics/cast_egl_platform_default.cc',
             'graphics/graphics_properties_default.cc',
             'graphics/osd_plane_default.cc'
           ],
         }
       ]
     }],
   ],  # end of conditions
 }