Remove the enable_themes build flag and define.

chrome/browser/search/instant_service_factory.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_factory.h"
 
+#include "build/build_config.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/search/search.h"
 
@@ skipping 10 matching lines @@
 InstantServiceFactory* InstantServiceFactory::GetInstance() {
   return base::Singleton<InstantServiceFactory>::get();
 }
 
 InstantServiceFactory::InstantServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "InstantService",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(suggestions::SuggestionsServiceFactory::GetInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
-#if defined(ENABLE_THEMES)
+#if !defined(OS_ANDROID)
   DependsOn(ThemeServiceFactory::GetInstance());
 #endif
   DependsOn(TopSitesFactory::GetInstance());
 }
 
 InstantServiceFactory::~InstantServiceFactory() {
 }
 
 content::BrowserContext* InstantServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
 KeyedService* InstantServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return search::IsInstantExtendedAPIEnabled()
              ? new InstantService(static_cast<Profile*>(profile))
              : NULL;
 }