Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1610 matching lines @@
         'browser/screensaver_window_finder_gtk.cc',
         'browser/screensaver_window_finder_gtk.h',
         'browser/search/instant_io_context.cc',
         'browser/search/instant_io_context.h',
         'browser/search/instant_service.cc',
         'browser/search/instant_service.h',
         'browser/search/instant_service_factory.cc',
         'browser/search/instant_service_factory.h',
         'browser/search/local_ntp_source.cc',
         'browser/search/local_ntp_source.h',
-        'browser/search/local_omnibox_popup_source.cc',
-        'browser/search/local_omnibox_popup_source.h',
         'browser/search/search.cc',
         'browser/search/search.h',
         'browser/search_engines/search_engine_type.h',
         'browser/search_engines/search_host_to_urls_map.cc',
         'browser/search_engines/search_host_to_urls_map.h',
         'browser/search_engines/search_provider_install_data.cc',
         'browser/search_engines/search_provider_install_data.h',
         'browser/search_engines/search_provider_install_state_message_filter.cc',
         'browser/search_engines/search_provider_install_state_message_filter.h',
         'browser/search_engines/search_terms_data.cc',
@@ skipping 1375 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }