Revert 28422

runtime/bin/vmservice_impl.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/vmservice_impl.h"
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 29 matching lines @@
     Dart_ShutdownIsolate();                                     \
     return false;                                               \
   }
 
 #define kLibraryResourceNamePrefix "/vmservice"
 static const char* kVMServiceIOLibraryScriptResourceName =
     kLibraryResourceNamePrefix "/vmservice_io.dart";
 static const char* kVMServiceLibraryName =
     kLibraryResourceNamePrefix "/vmservice.dart";
 
-#define kClientResourceNamePrefix "/vmservice/client"
+#define kClientResourceNamePrefix "/client/web/out"
 
 Dart_Isolate VmService::isolate_ = NULL;
 Dart_Port VmService::port_ = ILLEGAL_PORT;
 dart::Monitor* VmService::monitor_ = NULL;
 const char* VmService::error_msg_ = NULL;
 
 // These must be kept in sync with vmservice/constants.dart
 #define VM_SERVICE_ISOLATE_STARTUP_MESSAGE_ID 1
 #define VM_SERVICE_ISOLATE_SHUTDOWN_MESSAGE_ID 2
 
@@ skipping 78 matching lines @@
   Dart_EnterIsolate(isolate_);
   Dart_EnterScope();
 
 
   Dart_Handle library = Dart_RootLibrary();
   // Set requested port.
   DartUtils::SetIntegerField(library, "_port", server_port);
   result = Dart_Invoke(library, DartUtils::NewString("main"), 0, NULL);
   SHUTDOWN_ON_ERROR(result);
 
-  Dart_Handle library_name = Dart_NewStringFromCString(kVMServiceLibraryName);
-  library = Dart_LookupLibrary(library_name);
-  SHUTDOWN_ON_ERROR(library);
   result = LoadResources(library);
   SHUTDOWN_ON_ERROR(result);
   result = Dart_CompileAll();
   SHUTDOWN_ON_ERROR(result);
 
   port_ = Dart_GetMainPortId();
 
   Dart_ExitScope();
   Dart_ExitIsolate();
 
@@ skipping 357 matching lines @@
     if (!strcmp(function_name, entry.name) &&
         (num_arguments == entry.num_arguments)) {
       return entry.function;
     }
   }
   return NULL;
 }
 
 }  // namespace bin
 }  // namespace dart