| Index: runtime/bin/vmservice_impl.h
 | 
| diff --git a/runtime/bin/vmservice_impl.h b/runtime/bin/vmservice_impl.h
 | 
| index 5c03c33d19fe667e8c5d0d68be31f14d11e96c4f..f923dcac3c58a8ac58c002642115ec417b7c8ad1 100644
 | 
| --- a/runtime/bin/vmservice_impl.h
 | 
| +++ b/runtime/bin/vmservice_impl.h
 | 
| @@ -24,21 +24,16 @@ class VmService {
 | 
|    // Error message if startup failed.
 | 
|    static const char* GetErrorMessage();
 | 
|  
 | 
| -  // HTTP server's IP.
 | 
| -  static const char* GetServerIP() {
 | 
| -    return &server_ip_[0];
 | 
| -  }
 | 
| -
 | 
| -  // HTTP server's port.
 | 
| -  static intptr_t GetServerPort() {
 | 
| -    return server_port_;
 | 
| +  // HTTP Server's address.
 | 
| +  static const char* GetServerAddress() {
 | 
| +    return &server_uri_[0];
 | 
|    }
 | 
|  
 | 
|   private:
 | 
| -  static const intptr_t kServerIpStringBufferSize = 256;
 | 
| +  static const intptr_t kServerUriStringBufferSize = 1024;
 | 
|    friend void NotifyServerState(Dart_NativeArguments args);
 | 
|  
 | 
| -  static void SetServerIPAndPort(const char* ip, intptr_t port);
 | 
| +  static void SetServerAddress(const char* server_uri_);
 | 
|    static Dart_Handle GetSource(const char* name);
 | 
|    static Dart_Handle LoadScript(const char* name);
 | 
|    static Dart_Handle LoadLibrary(const char* name);
 | 
| @@ -49,8 +44,7 @@ class VmService {
 | 
|                                         Dart_Handle url);
 | 
|  
 | 
|    static const char* error_msg_;
 | 
| -  static char server_ip_[kServerIpStringBufferSize];
 | 
| -  static intptr_t server_port_;
 | 
| +  static char server_uri_[kServerUriStringBufferSize];
 | 
|  
 | 
|    DISALLOW_ALLOCATION();
 | 
|    DISALLOW_IMPLICIT_CONSTRUCTORS(VmService);
 | 
| 
 |