Remove remainder of USE_ATHENA ifdefs

chrome/browser/sessions/session_service_factory.cc

 // 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.
 
 #include "chrome/browser/sessions/session_service_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_data_deleter.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 // static
 SessionService* SessionServiceFactory::GetForProfile(Profile* profile) {
-#if defined(OS_ANDROID) || defined(USE_ATHENA)
-  // For Android and Athena we do not store sessions in the SessionService.
+#if defined(OS_ANDROID)
+  // For Android we do not store sessions in the SessionService.
   return NULL;
 #else
   return static_cast<SessionService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 #endif
 }
 
 // static
 SessionService* SessionServiceFactory::GetForProfileIfExisting(
     Profile* profile) {
-#if defined(OS_ANDROID) || defined(USE_ATHENA)
-  // For Android and Athena we do not store sessions in the SessionService.
+#if defined(OS_ANDROID)
+  // For Android we do not store sessions in the SessionService.
   return NULL;
 #else
   return static_cast<SessionService*>(
       GetInstance()->GetServiceForBrowserContext(profile, false));
 #endif
 }
 
 // static
 SessionService* SessionServiceFactory::GetForProfileForSessionRestore(
     Profile* profile) {
@@ skipping 45 matching lines @@
   return service;
 }
 
 bool SessionServiceFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
 bool SessionServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }