Remove all uses of toolkit_use_gtk in the gyp files.

BUG=297026
R=ben@chromium.org, brettw@chromium.org

Review URL: https://codereview.chromium.org/238633004

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

30 files changed, 24 insertions, 415 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 330c76a..4e8d9ce 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -40,14 +40,6 @@
             ['chromeos==1', {
               'sources/': [ ['include', '_chromeos\\.cc$'] ]
             }],
-            ['toolkit_uses_gtk==1', {
-              'dependencies': [
-                '../build/linux/system.gyp:gtk',
-              ],
-              'export_dependent_settings': [
-                '../build/linux/system.gyp:gtk',
-              ],
-            }],
           ],
           'dependencies': [
             'symbolize',
@@ -251,12 +243,6 @@
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk==1', {
-          'dependencies': [
-            # i18n/rtl.cc uses gtk
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
@@ -694,13 +680,10 @@
             'file_version_info_unittest.cc',
           ],
           'conditions': [
-            [ 'toolkit_uses_gtk==1', {
+            [ 'desktop_linux==1', {
               'sources': [
                 'nix/xdg_util_unittest.cc',
               ],
-              'dependencies': [
-                '../build/linux/system.gyp:gtk',
-              ]
             }],
           ],
         }],
@@ -831,12 +814,6 @@
         'base',
       ],
       'conditions': [
-        ['toolkit_uses_gtk==1', {
-          'dependencies': [
-            # test_suite initializes GTK.
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['os_posix==0', {
           'sources!': [
             'test/scoped_locale.cc',
@@ -972,17 +949,6 @@
           'PERF_TEST',
         ],
       },
-      'conditions': [
-        ['toolkit_uses_gtk==1', {
-          'dependencies': [
-            # Needed to handle the #include chain:
-            #   base/test/perf_test_suite.h
-            #   base/test/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'sanitizer_options',
diff --git a/build/all.gyp b/build/all.gyp
index 651982f..6473bb1 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -152,11 +152,6 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
           ],
         }],
-        ['toolkit_uses_gtk==1', {
-          'dependencies': [
-            '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
-          ],
-        }],
         ['OS=="win"', {
           'conditions': [
             ['win_use_allocator_shim==1', {
diff --git a/build/build_config.h b/build/build_config.h
index e26d75e..538995b 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -49,12 +49,6 @@
 #error Please add support for your platform in build/build_config.h
 #endif
 
-// Use TOOLKIT_GTK on X11 if TOOLKIT_VIEWS and USE_AURA aren't defined.
-#if defined(USE_X11) && !defined(TOOLKIT_VIEWS) && !defined(USE_AURA) && \
-    !defined(OS_NACL)
-#define TOOLKIT_GTK
-#endif
-
 #if defined(USE_OPENSSL) && defined(USE_NSS)
 #error Cannot use both OpenSSL and NSS
 #endif
diff --git a/build/common.gypi b/build/common.gypi
index ebec615..cbf994d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -194,13 +194,6 @@
             'toolkit_views%': 0,
           }],
 
-          # Set toolkit_uses_gtk for the Chromium browser on Linux.
-          ['desktop_linux==1 and use_aura==0 and use_ozone==0', {
-            'toolkit_uses_gtk%': 1,
-          }, {
-            'toolkit_uses_gtk%': 0,
-          }],
-
           # Enable HiDPI on Mac OS, Chrome OS and Windows.
           ['OS=="mac" or chromeos==1 or OS=="win"', {
             'enable_hidpi%': 1,
@@ -253,7 +246,6 @@
       'target_arch%': '<(target_arch)',
       'target_subarch%': '<(target_subarch)',
       'toolkit_views%': '<(toolkit_views)',
-      'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
       'desktop_linux%': '<(desktop_linux)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
@@ -634,8 +626,8 @@
           'use_gnome_keyring%': 1,
         }],
 
-        ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', {
-          # GTK+, Mac and iOS want Title Case strings
+        ['OS=="mac" or OS=="ios"', {
+          # Mac and iOS want Title Case strings
           'use_titlecase_in_grd_files%': 1,
         }],
 
@@ -956,7 +948,6 @@
     'use_ozone_evdev%': '<(use_ozone_evdev)',
     'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
     'use_system_fontconfig%': '<(use_system_fontconfig)',
-    'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
     'desktop_linux%': '<(desktop_linux)',
     'use_x11%': '<(use_x11)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
@@ -1826,9 +1817,6 @@
       ['toolkit_views==1', {
         'grit_defines': ['-D', 'toolkit_views'],
       }],
-      ['toolkit_uses_gtk==1', {
-        'grit_defines': ['-D', 'toolkit_uses_gtk'],
-      }],
       ['use_aura==1', {
         'grit_defines': ['-D', 'use_aura'],
       }],
@@ -2332,11 +2320,6 @@
       ['enable_one_click_signin==1', {
         'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
       }],
-      ['toolkit_uses_gtk==1 and toolkit_views==0', {
-        # TODO(erg): We are progressively sealing up use of deprecated features
-        # in gtk in preparation for an eventual porting to gtk3.
-        'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
-      }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi
index 9bb76c5..001b975 100644
--- a/build/filename_rules.gypi
+++ b/build/filename_rules.gypi
@@ -71,13 +71,6 @@
         ['exclude', '(^|/)x/'],
       ],
     }],
-    ['<(toolkit_uses_gtk)!=1 or >(nacl_untrusted_build)==1', {
-      'sources/': [
-        ['exclude', '_gtk(_browsertest|_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)gtk/'],
-        ['exclude', '(^|/)gtk_[^/]*\\.(h|cc)$'],
-      ],
-    }],
     ['<(toolkit_views)==0 or >(nacl_untrusted_build)==1', {
       'sources/': [ ['exclude', '_views\\.(h|cc)$'] ]
     }],
diff --git a/chrome/PRESUBMIT.py b/chrome/PRESUBMIT.py
index d2b0b8d..bf91a9c 100644
--- a/chrome/PRESUBMIT.py
+++ b/chrome/PRESUBMIT.py
@@ -24,8 +24,6 @@ EXCLUDE = (
   r'render_messages.h$',
   # Autogenerated window resources files are off limits
   r'.*resource.h$',
-  # GTK macros in C-ish header code cause false positives
-  r'gtk_.*\.h$',
   # Header trickery
   r'.*-inl\.h$',
   # Templates
diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
index 4182090..9f0f546 100644
--- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc
@@ -15,10 +15,6 @@
 #include "ui/base/base_window.h"
 #include "ui/gfx/rect.h"
 
-#ifdef TOOLKIT_GTK
-#include "content/public/test/test_utils.h"
-#endif
-
 using apps::AppWindow;
 
 namespace {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 14a26d1..cb2e798 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3087,45 +3087,6 @@
             'browser/net/nss_context.h',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            '../build/linux/system.gyp:gconf',
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:gtkprint',
-            '../build/linux/system.gyp:ssl',
-            '../build/linux/system.gyp:x11',
-            '../dbus/dbus.gyp:dbus',
-            '../third_party/undoview/undoview.gyp:undoview',
-          ],
-          'conditions': [
-            ['OS=="linux"', {
-              'link_settings': {
-                'libraries': [
-                  # For dlsym() in 'browser/zygote_main_linux.cc'
-                  '-ldl',
-                ],
-              },
-            }],
-          ],
-        }, {
-          'sources!': [
-            'browser/notifications/balloon_collection.cc',
-            'browser/notifications/balloon_collection.h',
-            'browser/notifications/balloon_collection_base.cc',
-            'browser/notifications/balloon_collection_base.h',
-            'browser/notifications/balloon_collection_impl.cc',
-            'browser/notifications/balloon_collection_impl.h',
-            'browser/notifications/balloon_host.cc',
-            'browser/notifications/balloon_host.h',
-            'browser/notifications/balloon_notification_ui_manager.cc',
-            'browser/notifications/balloon_notification_ui_manager.h',
-            'browser/notifications/notification_options_menu_model.cc',
-            'browser/notifications/notification_options_menu_model.h',
-            'browser/task_manager/notification_resource_provider.cc',
-            'browser/task_manager/notification_resource_provider.h',
-          ]
-        }],
         ['input_speech==0', {
           'sources/': [
             ['exclude', '^browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui'],
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index e293b66..7e1e83f 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -174,31 +174,6 @@
                 },
               ],
             }],
-            ['toolkit_uses_gtk == 1', {
-              'dependencies': [
-                # On Linux, link the dependencies (libraries) that make up actual
-                # Chromium functionality directly into the executable.
-                '<@(chromium_browser_dependencies)',
-                '<@(chromium_child_dependencies)',
-                '../content/content.gyp:content_app_both',
-                # Needed for chrome_main.cc initialization of libraries.
-                '../build/linux/system.gyp:gtk',
-                # Needed to use the master_preferences functions
-                'installer_util',
-              ],
-            }, { # else toolkit_uses_gtk == 1
-              'dependencies': [
-                # On Linux, link the dependencies (libraries) that make up actual
-                # Chromium functionality directly into the executable.
-                '<@(chromium_browser_dependencies)',
-                '<@(chromium_child_dependencies)',
-                '../content/content.gyp:content_app_both',
-                # Needed for chrome_main.cc initialization of libraries.
-                '../build/linux/system.gyp:pangocairo',
-                # Needed to use the master_preferences functions
-                'installer_util',
-              ],
-            }],
             # x11 build. Needed for chrome_main.cc initialization of libraries.
             ['use_x11==1', {
               'dependencies': [
@@ -213,6 +188,17 @@
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
+          'dependencies': [
+            # On Linux, link the dependencies (libraries) that make up actual
+            # Chromium functionality directly into the executable.
+            '<@(chromium_browser_dependencies)',
+            '<@(chromium_child_dependencies)',
+            '../content/content.gyp:content_app_both',
+            # Needed for chrome_main.cc initialization of libraries.
+            '../build/linux/system.gyp:pangocairo',
+            # Needed to use the master_preferences functions
+            'installer_util',
+          ],
         }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6b4cbd5..ec85f36 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -151,17 +151,6 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }, {
-          'sources!': [
-            'browser/notifications/desktop_notifications_unittest.cc',
-            'browser/notifications/desktop_notifications_unittest.h',
-            'browser/notifications/notification_browsertest.cc',
-          ]
-        }],
         ['OS=="linux" and use_aura==1', {
           # TODO(gbillock): aura linux does not support the automation for
           # SendMouseMoveNotifyWhenDone
@@ -169,7 +158,7 @@
             'browser/ui/views/toolbar/toolbar_button_test.cc',
           ],
         }],
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ -1793,7 +1782,7 @@
             'app/chrome_version.rc.version',
           ],
         }],
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ -2095,7 +2084,7 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ -2320,7 +2309,7 @@
         'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ -2425,7 +2414,7 @@
         'test/data/resource.rc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0e427a7..cd66b9b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -357,7 +357,7 @@
             ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'],
           ],
         }],
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ -2287,7 +2287,7 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+        ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
diff --git a/components/nacl.gyp b/components/nacl.gyp
index dd23775..eb0fb6a 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -244,11 +244,6 @@
                 '../ppapi/nacl_irt/ppapi_dispatcher.h',
               ],
               'conditions': [
-                ['toolkit_uses_gtk == 1', {
-                  'dependencies': [
-                    '../build/linux/system.gyp:gtk',
-                  ],
-                }],
                 ['use_glib == 1', {
                   'dependencies': [
                     '../build/linux/system.gyp:glib',
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 9659231..77c9f32 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -182,8 +182,6 @@ static void GLibLogHandler(const gchar* log_domain,
   } else if (strstr(message, "Unable to create Ubuntu Menu Proxy") &&
              strstr(log_domain, "<unknown>")) {
     LOG(ERROR) << "GTK menu proxy create failed";
-  } else if (strstr(message, "gtk_drag_dest_leave: assertion")) {
-    LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557";
   } else if (strstr(message, "Out of memory") &&
              strstr(log_domain, "<unknown>")) {
     LOG(ERROR) << "DBus call timeout or out of memory: "
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 591e4e2..00c2088 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -129,15 +129,6 @@
             }],
           ],
         }],
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            # Workaround for gyp bug 69.
-            # Needed to handle the #include chain:
-            #   base/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
@@ -157,17 +148,6 @@
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
-      'conditions': [
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            # Workaround for gyp bug 69.
-            # Needed to handle the #include chain:
-            #   base/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
     },
   ],
   'conditions': [
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index cd4662d..5dd3962 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -131,11 +131,6 @@
     'command_buffer/service/vertex_attrib_manager.cc',
   ],
   'conditions': [
-    ['toolkit_uses_gtk == 1', {
-      'dependencies': [
-        '../build/linux/system.gyp:gtk',
-      ],
-    }],
     ['ui_compositor_image_transport==1', {
       'include_dirs': [
         '../third_party/khronos',
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
index b2ebe14..d34996e 100644
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -83,11 +83,6 @@
         'egl_native',
         '../../third_party/khronos/khronos.gyp:khronos_headers',
       ],
-      'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': ['../../build/linux/system.gyp:gtk'],
-        }],
-      ],
       'sources': [
         'native/main.cc',
         'native/egl_native.cc',
@@ -111,9 +106,6 @@
         '../../third_party/expat/expat.gyp:expat',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': ['../../build/linux/system.gyp:gtk'],
-        }],
         # See http://crbug.com/162998#c4 for why this is needed.
         # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
         ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 0546deb..ecd2808 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -62,11 +62,6 @@
         'unix_domain_socket_util_unittest.cc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['OS == "win" or OS == "ios"', {
           'sources!': [
             'unix_domain_socket_util_unittest.cc',
@@ -111,11 +106,6 @@
         'ipc_test_base.h',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index 8ccda5d..9799a0a 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -99,13 +99,6 @@
           'export_dependent_settings': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
-          'conditions': [
-            ['toolkit_uses_gtk == 1', {
-              'dependencies': [
-                '../build/linux/system.gyp:gtk'
-              ],
-            }],
-          ],
         },
         {
           'target_name': 'notifier_test_util',
diff --git a/media/media.gyp b/media/media.gyp
index 2a7d66b..75da609 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -891,11 +891,6 @@
             }],
           ],
         }],
-        ['toolkit_uses_gtk==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'media_asm',
@@ -1660,25 +1655,6 @@
           'sources': [
             'ffmpeg/ffmpeg_unittest.cc',
           ],
-          'conditions': [
-            ['toolkit_uses_gtk==1', {
-              'dependencies': [
-                # Needed for the following #include chain:
-                #   base/run_all_unittests.cc
-                #   ../base/test_suite.h
-                #   gtk/gtk.h
-                '../build/linux/system.gyp:gtk',
-              ],
-              'conditions': [
-                # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
-                ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
-                  'dependencies': [
-                    '../base/allocator/allocator.gyp:allocator',
-                  ],
-                }],
-              ],
-            }],
-          ],
         },
         {
           'target_name': 'ffmpeg_regression_tests',
diff --git a/net/net.gyp b/net/net.gyp
index 95477e1..1cc81a8 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -300,11 +300,6 @@
             ],
           },
         ],
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gdk',
-          ],
-        }],
         [ 'use_nss != 1', {
             'sources!': [
               'cert/cert_verify_proc_nss.cc',
@@ -536,12 +531,6 @@
             }],
           ],
         }],
-        [ 'toolkit_uses_gtk == 1', {
-            'dependencies': [
-              '../build/linux/system.gyp:gtk',
-            ],
-          },
-        ],
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
diff --git a/printing/printing.gyp b/printing/printing.gyp
index bd4940d..6d3f353 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -98,16 +98,6 @@
           'dependencies': [
             '<(DEPTH)/ui/aura/aura.gyp:aura',
           ],
-        }], 
-        ['toolkit_uses_gtk == 0',{
-            'sources/': [['exclude', '_cairo\\.cc$']]
-          }, {  # else: toolkit_uses_gtk == 1
-          'dependencies': [
-            # For FT_Init_FreeType and friends.
-            '../build/linux/system.gyp:freetype2',
-            '../build/linux/system.gyp:gtk',
-            '../build/linux/system.gyp:gtkprint',
-          ],
         }],
         # Mac-Aura does not support printing.
         ['OS=="mac" and use_aura==1',{
@@ -255,7 +245,6 @@
         'units_unittest.cc',
       ],
       'conditions': [
-        ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}],
         ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]}],
         ['use_cups==1', {
@@ -266,11 +255,6 @@
             'backend/cups_helper_unittest.cc',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
             # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
diff --git a/tools/gtk_clipboard_dump/gtk_clipboard_dump.cc b/tools/gtk_clipboard_dump/gtk_clipboard_dump.cc
deleted file mode 100644
index 4ddf1a2..0000000
--- a/tools/gtk_clipboard_dump/gtk_clipboard_dump.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <string.h>
-#include <string>
-
-namespace {
-
-void PrintClipboardContents(GtkClipboard* clip) {
-  GdkAtom* targets;
-  int num_targets = 0;
-
-  // This call is bugged, the cache it checks is often stale; see
-  // <http://bugzilla.gnome.org/show_bug.cgi?id=557315>.
-  // gtk_clipboard_wait_for_targets(clip, &targets, &num_targets);
-
-  GtkSelectionData* target_data =
-      gtk_clipboard_wait_for_contents(clip,
-                                      gdk_atom_intern("TARGETS", false));
-  if (!target_data) {
-    printf("failed to get the contents!\n");
-    return;
-  }
-
-  gtk_selection_data_get_targets(target_data, &targets, &num_targets);
-
-  printf("%d available targets:\n---------------\n", num_targets);
-
-  for (int i = 0; i < num_targets; i++) {
-    gchar* target_name_cstr = gdk_atom_name(targets[i]);
-    std::string target_name(target_name_cstr);
-    g_free(target_name_cstr);
-    printf("  [format: %s", target_name.c_str());
-    GtkSelectionData* data = gtk_clipboard_wait_for_contents(clip, targets[i]);
-    if (!data) {
-      printf("]: NULL\n\n");
-      continue;
-    }
-
-    printf(" / length: %d / bits %d]: ", data->length, data->format);
-
-    if (strstr(target_name.c_str(), "image")) {
-      printf("(image omitted)\n\n");
-    } else if (strstr(target_name.c_str(), "TIMESTAMP")) {
-      // TODO(estade): Print the time stamp in human readable format.
-      printf("(time omitted)\n\n");
-    } else {
-      for (int j = 0; j < data->length; j++) {
-        // Output data one byte at a time. Currently wide strings look
-        // pretty weird.
-        printf("%c", (data->data[j] == 0 ? '_' : data->data[j]));
-      }
-      printf("\n\n");
-    }
-    gtk_selection_data_free(data);
-  }
-
-  if (num_targets <= 0) {
-    printf("No targets advertised. Text is: ");
-    gchar* text = gtk_clipboard_wait_for_text(clip);
-    printf("%s\n", text ? text : "NULL");
-    g_free(text);
-  }
-
-  g_free(targets);
-  gtk_selection_data_free(target_data);
-}
-
-}
-
-/* Small program to dump the contents of GTK's clipboards to the terminal.
- * Feel free to add to it or improve formatting or whatnot.
- */
-int main(int argc, char* argv[]) {
-  gtk_init(&argc, &argv);
-
-  printf("Desktop clipboard\n");
-  PrintClipboardContents(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
-
-  printf("X clipboard\n");
-  PrintClipboardContents(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
-}
diff --git a/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp b/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp
deleted file mode 100644
index 2112108..0000000
--- a/tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'gtk_clipboard_dump',
-      'type': 'executable',
-      'dependencies': [
-        '../../build/linux/system.gyp:gtk',
-      ],
-      'sources': [
-        'gtk_clipboard_dump.cc',
-      ],
-    },
-  ],
-}
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 2ee7723..5678114 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -376,7 +376,6 @@
         }],
         ['use_glib == 1', {
           'dependencies': [
-            # font_gtk.cc uses fontconfig.
             '../../build/linux/system.gyp:fontconfig',
             '../../build/linux/system.gyp:glib',
           ],
diff --git a/ui/gfx/gdk_compat.h b/ui/gfx/gdk_compat.h
deleted file mode 100644
index b11d779..0000000
--- a/ui/gfx/gdk_compat.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef UI_GFX_GDK_COMPAT_H_
-#define UI_GFX_GDK_COMPAT_H_
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-// Google Chrome must depend on GTK 2.18, at least until the next LTS drops
-// (and we might have to extend which version of GTK we want to target due to
-// RHEL). To make our porting job for GTK3 easier, we define all the methods
-// that replace deprecated APIs in this file and then include it everywhere.
-//
-// This file is organized first by version, and then with each version,
-// alphabetically by method.
-
-#if !GTK_CHECK_VERSION(2, 24, 0)
-inline GdkWindow* gdk_x11_window_lookup_for_display(GdkDisplay* display,
-                                                    Window window) {
-  return static_cast<GdkWindow*>(gdk_xid_table_lookup_for_display(display,
-                                                                  window));
-}
-#endif
-
-#endif  // UI_GFX_GDK_COMPAT_H_
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 260f05c..6cd4ed9 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -259,7 +259,7 @@
         <structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_F_H_TOP_RIGHT" file="common/combobox_button_top_right_focused_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_F_P_TOP_RIGHT" file="common/combobox_button_top_right_focused_pressed.png" />
       </if>
-      <if expr="toolkit_uses_gtk or toolkit_views">
+      <if expr="toolkit_views">
         <structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" />
         <structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" />
         <structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" />
@@ -484,7 +484,7 @@
         <structure type="chrome_scaled_image" name="IDR_SCROLLBAR_THUMB_BASE_PRESSED_TOP_LEFT" file="common/aura_scrollbar_thumb_base_pressed_top_left.png" />
         <structure type="chrome_scaled_image" name="IDR_SCROLLBAR_THUMB_BASE_PRESSED_TOP_RIGHT" file="common/aura_scrollbar_thumb_base_pressed_top_right.png" />
       </if>
-      <if expr="toolkit_uses_gtk or toolkit_views">
+      <if expr="toolkit_views">
         <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM" file="common/textbutton_hover_bottom.png" />
         <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT" file="common/textbutton_hover_bottom_left.png" />
         <structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT" file="common/textbutton_hover_bottom_right.png" />
@@ -524,7 +524,7 @@
         <structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY" file="mac/notification_tray_empty.png"/>
         <structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY_PRESSED" file="mac/notification_tray_empty_pressed.png"/>
       </if>
-      <if expr="toolkit_uses_gtk or toolkit_views">
+      <if expr="toolkit_views">
         <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_CENTER" file="common/window_bottom_center.png" />
         <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="common/window_bottom_left_corner.png" />
         <structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="common/window_bottom_right_corner.png" />
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index a226070..4a89500 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -237,14 +237,6 @@
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
-        ['toolkit_uses_gtk == 1', {
-          'sources': [
-            'base/dragdrop/gtk_dnd_util_unittest.cc',
-          ],
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'gfx/render_text_unittest.cc',
diff --git a/ui/views/metrics_aura.cc b/ui/views/metrics_aura.cc
index 03aa832..046baa8 100644
--- a/ui/views/metrics_aura.cc
+++ b/ui/views/metrics_aura.cc
@@ -11,7 +11,6 @@
 namespace {
 
 // Default double click interval in milliseconds.
-// Same as what gtk uses.
 const int kDefaultDoubleClickInterval = 500;
 
 }  // namespace
diff --git a/ui/views/view_aura.cc b/ui/views/view_aura.cc
index 006f1da..ce60963 100644
--- a/ui/views/view_aura.cc
+++ b/ui/views/view_aura.cc
@@ -7,11 +7,9 @@
 namespace {
 
 // Default horizontal drag threshold in pixels.
-// Same as what gtk uses.
 const int kDefaultHorizontalDragThreshold = 8;
 
 // Default vertical drag threshold in pixels.
-// Same as what gtk uses.
 const int kDefaultVerticalDragThreshold = 8;
 
 }  // namespace
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index 21260c2..dd3e20e 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -53,12 +53,6 @@
       ],
 
       'conditions': [
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-          'sources/': [['exclude', '_x11\\.cc$']],
-        }],
         ['use_aura==1 and use_x11==1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:xcursor',