Remove remainder of USE_ATHENA ifdefs

chrome/browser/renderer_host/pepper/pepper_talk_host.cc

Index: chrome/browser/renderer_host/pepper/pepper_talk_host.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc
index 0b61c0c6c1ba53145af8e688899da3d7d291f32d..24dc52c2680c2bdff01e70d78958b411e8326b06 100644
--- a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc
@@ -41,8 +41,7 @@ ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
   if (!render_frame_host)
     return reply;  // RFH destroyed while task was pending.
 
-  // crbug.com/381398, crbug.com/413906 for !USE_ATHENA
-#if defined(USE_ASH) && !defined(USE_ATHENA)
+#if defined(USE_ASH)
   base::string16 title;
   base::string16 message;
 
@@ -81,7 +80,7 @@ ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
   return reply;
 }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)

[sky, 2015/01/15 16:28:34]

What about the USE_ASH here and the next two?

[pkotwicz, 2015/01/15 16:44:10]

Am I missing something? Is it possible to compile chromeos without USE_ASH?

The ifdefs seem to have been added in Patch Set 8 here (after the CL was
LGTMed): https://chromiumcodereview.appspot.com/17043006

 void OnTerminateRemotingEventOnUIThread(const base::Closure& stop_callback) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, stop_callback);
@@ -101,7 +100,7 @@ ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
     return reply;  // RFH destroyed while task was pending.
   }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)
   base::Closure stop_callback_ui_thread =
       base::Bind(&OnTerminateRemotingEventOnUIThread, stop_callback);
 
@@ -117,7 +116,7 @@ ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
 
 void StopRemotingOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
+#if defined(OS_CHROMEOS)
   if (ash::Shell::GetInstance()) {
     ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStop();
   }