Disable Chrome Frame in Win64 build

Several parts don't compile, so disabling for now. 
Also suppressing a warning that blocked ninja on x64.

BUG=176875
TBR=brettw@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12315062

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

3 files changed, 41 insertions, 26 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 8cf4090..ddb6558 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -130,11 +130,12 @@
               'dependencies': [
                 # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
                 '../tools/memory_watcher/memory_watcher.gyp:*',
+                # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875
+                '../chrome_frame/chrome_frame.gyp:*',
               ],
             }],
           ],
           'dependencies': [
-            '../chrome_frame/chrome_frame.gyp:*',
             '../cloud_print/cloud_print.gyp:*',
             '../courgette/courgette.gyp:*',
             '../rlz/rlz.gyp:*',
@@ -238,11 +239,6 @@
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
             '../sandbox/sandbox.gyp:sbox_integration_tests',
@@ -254,14 +250,23 @@
             '../webkit/webkit.gyp:test_shell_common',
            ],
            'conditions': [
-              ['use_aura==1', {
+             ['target_arch!="x64"', {
+               'dependencies': [
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+               ]
+             }], # target_arch!="x64"
+             ['use_aura==1 or target_arch=="x64"', {
                'dependencies!': [
                  '../chrome_frame/chrome_frame.gyp:npchrome_frame',
                ],
                'defines': [
                  'OMIT_CHROME_FRAME',
                ],
-             }], # use_aura==1
+             }], # use_aura==1 or target_arch=="x64"
            ],
         }],
         ['OS=="linux"', {
@@ -545,11 +550,6 @@
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
             '../device/device.gyp:device_unittests',
@@ -571,26 +571,39 @@
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
           'conditions': [
-              ['use_aura==1', {
+             ['target_arch!="x64"', {
+               'dependencies': [
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+                 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+               ]
+             }], # target_arch!="x64"
+              ['use_aura==1 or target_arch=="x64"', {
                'dependencies!': [
                  '../chrome_frame/chrome_frame.gyp:npchrome_frame',
                ],
                'defines': [
                  'OMIT_CHROME_FRAME',
                ],
-             }], # use_aura==1
+             }], # use_aura==1 or target_arch=="x64"
           ],
         },
         {
           'target_name': 'chromium_builder_win_cf',
           'type': 'none',
-          'dependencies': [
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
-            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+          'conditions': [
+            ['target_arch!="x64"', {
+              'dependencies': [
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+              ],
+            }], # target_arch!="x64"
           ],
         },
         {
@@ -693,14 +706,14 @@
                     '../remoting/remoting.gyp:remoting_host_installation',
                   ],
                 }], # component != "shared_library"
-                ['use_aura==1', {
+                ['use_aura==1 or target_arch=="x64"', {
                   'dependencies!': [
                     '../chrome_frame/chrome_frame.gyp:npchrome_frame',
                   ],
                   'defines': [
                     'OMIT_CHROME_FRAME',
                   ],
-                }], # use_aura==1
+                }], # use_aura==1 or target_arch=="x64"
               ]
             },
           ], # targets
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5b8c6fa..b6027c0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -878,7 +878,7 @@
             '../ui/ui.gyp:ui_unittests',
           ],
           'conditions': [
-            ['use_aura==1', {
+            ['use_aura==1 or target_arch=="x64"', {
               'dependencies!': [
                 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
                 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 58838db..6c5d7ec 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -291,6 +291,8 @@
               'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
             },
           },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
           'rules': [
             {
               'rule_name': 'setup_version',
@@ -372,7 +374,7 @@
                  'branding_dir_100': 'app/theme/default_100_percent/chromium',
               },
             }],
-            ['use_aura==1', {
+            ['use_aura==1 or target_arch=="x64"', {
               'dependencies!': [
                 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
                 '../chrome_frame/chrome_frame.gyp:npchrome_frame',