| Index: remoting/client/jni/jni_display_handler.cc | 
| diff --git a/remoting/client/jni/jni_display_handler.cc b/remoting/client/jni/jni_display_handler.cc | 
| index cd51e52a2d415883374cfc676f06e23e893d4c13..923a04659e00a86b735ac645f4476a4810c2c1c5 100644 | 
| --- a/remoting/client/jni/jni_display_handler.cc | 
| +++ b/remoting/client/jni/jni_display_handler.cc | 
| @@ -102,7 +102,8 @@ void JniDisplayHandler::SetCursorShape( | 
| // the data out of the buffer without mutating it, and doesn't keep any | 
| // reference to the buffer afterwards. Unfortunately, there seems to be no way | 
| // to create a read-only ByteBuffer from a pointer-to-const. | 
| -  char* data = string_as_array(const_cast<std::string*>(&cursor_shape.data())); | 
| +  char* data = | 
| +      base::string_as_array(const_cast<std::string*>(&cursor_shape.data())); | 
| int cursor_total_bytes = | 
| cursor_shape.width() * cursor_shape.height() * kBytesPerPixel; | 
|  | 
|  |