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

chrome/browser/search/instant_service.cc

 // Copyright 2013 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 "chrome/browser/search/instant_service.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/local_ntp_source.h"
-#include "chrome/browser/search/local_omnibox_popup_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "googleurl/src/gurl.h"
@@ skipping 21 matching lines @@
                    profile->GetResourceContext(), instant_io_context_));
   }
 
   // Set up the data sources that Instant uses on the NTP.
 #if defined(ENABLE_THEMES)
   content::URLDataSource::Add(profile, new ThemeSource(profile));
 #endif
   content::URLDataSource::Add(profile, new ThumbnailSource(profile));
   content::URLDataSource::Add(profile, new FaviconSource(
       profile, FaviconSource::FAVICON));
-  content::URLDataSource::Add(profile, new LocalOmniboxPopupSource());
   content::URLDataSource::Add(profile, new LocalNtpSource());
 }
 
 InstantService::~InstantService() {
 }
 
 // static
 const std::string InstantService::MaybeTranslateInstantPathOnUI(
     Profile* profile, const std::string& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 108 matching lines @@
             BrowserThread::IO, FROM_HERE,
             base::Bind(&InstantIOContext::RemoveInstantProcessOnIO,
                        instant_io_context_, process_id));
       }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }