Run athena on device

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 b144cadf706cdc5653672199188862a085eca6b7..0b61c0c6c1ba53145af8e688899da3d7d291f32d 100644
--- a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc
@@ -41,7 +41,8 @@ ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
   if (!render_frame_host)
     return reply;  // RFH destroyed while task was pending.
 
-#if defined(USE_ASH)
+  // crbug.com/381398, crbug.com/413906 for !USE_ATHENA
+#if defined(USE_ASH) && !defined(USE_ATHENA)
   base::string16 title;
   base::string16 message;
 
@@ -80,7 +81,7 @@ ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
   return reply;
 }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS)
+#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
 void OnTerminateRemotingEventOnUIThread(const base::Closure& stop_callback) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, stop_callback);
@@ -100,7 +101,7 @@ ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
     return reply;  // RFH destroyed while task was pending.
   }
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS)
+#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
   base::Closure stop_callback_ui_thread =
       base::Bind(&OnTerminateRemotingEventOnUIThread, stop_callback);
 
@@ -116,7 +117,7 @@ ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
 
 void StopRemotingOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-#if defined(USE_ASH) && defined(OS_CHROMEOS)
+#if defined(USE_ASH) && defined(OS_CHROMEOS) && !defined(USE_ATHENA)
   if (ash::Shell::GetInstance()) {
     ash::Shell::GetInstance()->system_tray_notifier()->NotifyScreenShareStop();
   }