Fix breakpad-related Linux official build breakage.

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6bb8a836638b0779f9e9ad91bece399b284db085..a1ca31fc14be4d71058a6e31a7bda66699f2825e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1562,10 +1562,21 @@
             ['linux_breakpad==1', {
               'sources': [
                 'browser/renderer_host/render_crash_handler_host_linux.cc',
+                'app/breakpad_linux.cc',
+                'app/breakpad_linux.h',
+              ],
+              'dependencies': [
+                '../breakpad/breakpad.gyp:breakpad_client',
+              ],
+              'include_dirs': [
+                # breakpad_linux.cc wants file_version_info_linux.h
+                '<(SHARED_INTERMEDIATE_DIR)',
               ],
             }, {
               'sources': [
                 'browser/renderer_host/render_crash_handler_host_linux_stub.cc',
+                'app/breakpad_linux_stub.cc',
+                'app/breakpad_linux.h',
               ],
             }],
           ],
@@ -2090,27 +2101,6 @@
               'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
             },
           ],
-          'include_dirs': [
-            # Needed in order to be able to read the raw
-            # file_version_info_linux.h file.
-            '<(SHARED_INTERMEDIATE_DIR)',
-          ],
-          'conditions': [
-            ['linux_breakpad==1', {
-              'sources': [
-                'app/breakpad_linux.cc',
-                'app/breakpad_linux.h',
-              ],
-              'dependencies': [
-                '../breakpad/breakpad.gyp:breakpad_client',
-              ],
-            }, {
-              'sources': [
-                'app/breakpad_linux_stub.cc',
-                'app/breakpad_linux.h',
-              ],
-            }],
-          ]
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [