Revert "Build Observatory with runtime"

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 13 matching lines @@
 #define SHUTDOWN_ON_ERROR(handle)                               \
   if (Dart_IsError(handle)) {                                   \
     error_msg_ = strdup(Dart_GetError(handle));                 \
     Dart_ExitScope();                                           \
     Dart_ShutdownIsolate();                                     \
     return false;                                               \
   }
 
 #define kLibrarySourceNamePrefix "/vmservice"
 static const char* kVMServiceIOLibraryScriptResourceName = "vmservice_io.dart";
+#define kClientResourceNamePrefix "/vmservice/observatory/deployed/web"
 
 struct ResourcesEntry {
   const char* path_;
   const char* resource_;
   int length_;
 };
 
 extern ResourcesEntry __service_bin_resources_[];
 
 class Resources {
@@ skipping 194 matching lines @@
 
 
 Dart_Handle VmService::LoadSource(Dart_Handle library, const char* name) {
   Dart_Handle url = Dart_NewStringFromCString(name);
   Dart_Handle source = GetSource(name);
   return Dart_LoadSource(library, url, source, 0, 0);
 }
 
 
 Dart_Handle VmService::LoadResource(Dart_Handle library,
-                                    const char* resource_name) {
+                                    const char* resource_name,
+                                    const char* prefix) {
+  intptr_t prefix_len = strlen(prefix);
   // Prepare for invoke call.
-  Dart_Handle name = Dart_NewStringFromCString(resource_name);
+  Dart_Handle name = Dart_NewStringFromCString(resource_name+prefix_len);
   RETURN_ERROR_HANDLE(name);
   const char* data_buffer = NULL;
   int data_buffer_length = Resources::ResourceLookup(resource_name,
                                                      &data_buffer);
   if (data_buffer_length == Resources::kNoSuchInstance) {
-    printf("Could not find %s %s\n", resource_name, resource_name);
+    printf("Could not find %s %s\n", resource_name, resource_name+prefix_len);
   }
   ASSERT(data_buffer_length != Resources::kNoSuchInstance);
   Dart_Handle data_list = Dart_NewTypedData(Dart_TypedData_kUint8,
                                             data_buffer_length);
   RETURN_ERROR_HANDLE(data_list);
   Dart_TypedData_Type type = Dart_TypedData_kInvalid;
   void* data_list_buffer = NULL;
   intptr_t data_list_buffer_length = 0;
   Dart_Handle result = Dart_TypedDataAcquireData(data_list, &type,
                                                  &data_list_buffer,
@@ skipping 10 matching lines @@
   const intptr_t kNumArgs = 2;
   Dart_Handle args[kNumArgs] = { name, data_list };
   result = Dart_Invoke(library, Dart_NewStringFromCString("_addResource"),
                        kNumArgs, args);
   return result;
 }
 
 
 Dart_Handle VmService::LoadResources(Dart_Handle library) {
   Dart_Handle result = Dart_Null();
-  intptr_t prefixLen = strlen(kLibrarySourceNamePrefix);
+  intptr_t prefixLen = strlen(kClientResourceNamePrefix);
   for (intptr_t i = 0; Resources::Path(i) != NULL; i++) {
     const char* path = Resources::Path(i);
-    // If it doesn't begin with kLibrarySourceNamePrefix it is a frontend
-    // resource.
-    if (strncmp(path, kLibrarySourceNamePrefix, prefixLen) != 0) {
-      result = LoadResource(library, path);
+    if (!strncmp(path, kClientResourceNamePrefix, prefixLen)) {
+      result = LoadResource(library, path, kClientResourceNamePrefix);
       if (Dart_IsError(result)) {
         break;
       }
     }
   }
   return result;
 }
 
 
 Dart_Handle VmService::LibraryTagHandler(Dart_LibraryTag tag,
@@ skipping 43 matching lines @@
     printf("Service exited with an error:\n%s\n", Dart_GetError(result));
   }
   Dart_ExitScope();
   Dart_ExitIsolate();
 }
 
 
 
 }  // namespace bin
 }  // namespace dart