Merge the dart:uri library into dart:core and update the Uri class

runtime/vm/object_store.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_OBJECT_STORE_H_
 #define VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 249 matching lines @@
   RawLibrary* collection_library() const { return collection_library_; }
   RawLibrary* collection_dev_library() const {
     return collection_dev_library_;
   }
   RawLibrary* crypto_library() const { return crypto_library_; }
   RawLibrary* isolate_library() const { return isolate_library_; }
   RawLibrary* json_library() const { return json_library_; }
   RawLibrary* math_library() const { return math_library_; }
   RawLibrary* mirrors_library() const { return mirrors_library_; }
   RawLibrary* typed_data_library() const { return typed_data_library_; }
-  RawLibrary* uri_library() const { return uri_library_; }
   RawLibrary* utf_library() const { return utf_library_; }
   void set_bootstrap_library(intptr_t index, const Library& value) {
     switch (index) {
       case kAsync:
         async_library_ = value.raw();
         break;
       case kCore:
         core_library_ = value.raw();
         break;
       case kCollection:
@@ skipping 16 matching lines @@
         break;
       case kMirrors:
         mirrors_library_ = value.raw();
         break;
       case kTypedData:
         typed_data_library_ = value.raw();
         break;
       case kUtf:
         utf_library_ = value.raw();
         break;
-      case kUri:
-        uri_library_ = value.raw();
-        break;
       default:
         UNREACHABLE();
     }
   }
 
   void set_builtin_library(const Library& value) {
     builtin_library_ = value.raw();
   }
 
   RawLibrary* native_wrappers_library() const {
@@ skipping 144 matching lines @@
   RawLibrary* collection_library_;
   RawLibrary* collection_dev_library_;
   RawLibrary* crypto_library_;
   RawLibrary* isolate_library_;
   RawLibrary* json_library_;
   RawLibrary* math_library_;
   RawLibrary* mirrors_library_;
   RawLibrary* native_wrappers_library_;
   RawLibrary* root_library_;
   RawLibrary* typed_data_library_;
-  RawLibrary* uri_library_;
   RawLibrary* utf_library_;
   RawGrowableObjectArray* libraries_;
   RawGrowableObjectArray* pending_classes_;
   RawError* sticky_error_;
   RawString* unhandled_exception_handler_;
   RawContext* empty_context_;
   RawInstance* stack_overflow_;
   RawInstance* out_of_memory_;
   RawStacktrace* preallocated_stack_trace_;
   RawArray* keyword_symbols_;
   RawFunction* receive_port_create_function_;
   RawFunction* lookup_receive_port_function_;
   RawFunction* handle_message_function_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&keyword_symbols_); }
 
   friend class SnapshotReader;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_STORE_H_