[NTP Snippets] Merge SnippetsController into SnippetsBridge

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 861 matching lines @@
       'browser/android/net/external_estimate_provider_android.cc',
       'browser/android/net/external_estimate_provider_android.h',
       'browser/android/ntp/most_visited_sites.cc',
       'browser/android/ntp/most_visited_sites.h',
       'browser/android/ntp/new_tab_page_prefs.cc',
       'browser/android/ntp/new_tab_page_prefs.h',
       'browser/android/ntp/new_tab_page_url_handler.cc',
       'browser/android/ntp/new_tab_page_url_handler.h',
       'browser/android/ntp/ntp_snippets_bridge.cc',
       'browser/android/ntp/ntp_snippets_bridge.h',
-      'browser/android/ntp/ntp_snippets_controller.cc',
-      'browser/android/ntp/ntp_snippets_controller.h',
       'browser/android/ntp/ntp_snippets_launcher.cc',
       'browser/android/ntp/ntp_snippets_launcher.h',
       'browser/android/omnibox/answers_image_bridge.cc',
       'browser/android/omnibox/answers_image_bridge.h',
       'browser/android/omnibox/autocomplete_controller_android.cc',
       'browser/android/omnibox/autocomplete_controller_android.h',
       'browser/android/omnibox/omnibox_prerender.cc',
       'browser/android/omnibox/omnibox_prerender.h',
       'browser/android/password_ui_view_android.cc',
       'browser/android/password_ui_view_android.h',
@@ skipping 1046 matching lines @@
       'android/java/src/org/chromium/chrome/browser/metrics/VariationsSession.java',
       'android/java/src/org/chromium/chrome/browser/net/qualityprovider/ExternalEstimateProviderAndroid.java',
       'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',
       'android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java',
       'android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java',
       'android/java/src/org/chromium/chrome/browser/ntp/interests/InterestsService.java',
       'android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java',
       'android/java/src/org/chromium/chrome/browser/ntp/NewTabPagePrefs.java',
       'android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java',
       'android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java',
-      'android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsController.java',
       'android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java',
       'android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java',
       'android/java/src/org/chromium/chrome/browser/pageinfo/CertificateViewer.java',
       'android/java/src/org/chromium/chrome/browser/pageinfo/ConnectionInfoPopup.java',
       'android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java',
@@ skipping 2245 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }