Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

testing/legion/client_rpc_server.py

Index: testing/legion/client_rpc_server.py
diff --git a/testing/legion/rpc_server.py b/testing/legion/client_rpc_server.py
similarity index 94%
rename from testing/legion/rpc_server.py
rename to testing/legion/client_rpc_server.py
index 43b431707e851c0601058c401a3dcf3d0201c255..7a5f565156da667f7454703d4a04df3d145d7d92 100644
--- a/testing/legion/rpc_server.py
+++ b/testing/legion/client_rpc_server.py
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""The task RPC server code.
+"""The client RPC server code.
 
 This server is an XML-RPC server which serves code from
-rpc_methods.RPCMethods.
+client_rpc_methods.RPCMethods.
 
 This server will run until shutdown is called on the server object. This can
 be achieved in 2 ways:
@@ -22,8 +22,8 @@ import SimpleXMLRPCServer
 import SocketServer
 
 #pylint: disable=relative-import
+import client_rpc_methods
 import common_lib
-import rpc_methods
 
 
 class RequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
@@ -33,10 +33,10 @@ class RequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
   """
 
   def do_POST(self):
-    """Verifies the task is authorized to perform RPCs."""
+    """Verifies the client is authorized to perform RPCs."""
     if self.client_address[0] != self.server.authorized_address:
       logging.error('Received unauthorized RPC request from %s',
-                    self.task_address[0])
+                    self.client_address[0])
       self.send_response(403)
       response = 'Forbidden'
       self.send_header('Content-type', 'text/plain')
@@ -60,7 +60,7 @@ class RPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer,
 
     self.authorized_address = authorized_address
     self.idle_timeout_secs = idle_timeout_secs
-    self.register_instance(rpc_methods.RPCMethods(self))
+    self.register_instance(client_rpc_methods.RPCMethods(self))
 
     self._shutdown_requested_event = threading.Event()
     self._rpc_received_event = threading.Event()