Rationalize Dart mojo and sky package structure

services/dart/dart_app.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/dart/dart_app.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 
 DartApp::DartApp(mojo::InterfaceRequest<Application> application_request,
                  mojo::URLResponsePtr response,
                  bool strict)
     : application_request_(application_request.Pass()) {
   DCHECK(!response.is_null());
   std::string url(response->url);
 
   CHECK(unpacked_app_directory_.CreateUniqueTempDir());
   ExtractApplication(response.Pass());
-  base::FilePath package_root = unpacked_app_directory_.path();
+  base::FilePath package_root =
+      unpacked_app_directory_.path().AppendASCII("packages");
 
-  base::FilePath entry_path = package_root.Append("main.dart");
+  base::FilePath entry_path =
+      unpacked_app_directory_.path().Append("main.dart");
   std::string source;
   if (!base::ReadFileToString(entry_path, &source)) {
     NOTREACHED();
     return;
   }
 
   config_.application_data = reinterpret_cast<void*>(this);
   config_.strict_compilation = strict;
   config_.script = source;
   config_.script_uri = entry_path.AsUTF8Unsafe();
@@ skipping 35 matching lines @@
 }
 
 std::string DartApp::CopyToString(mojo::ScopedDataPipeConsumerHandle body) {
   std::string body_str;
   bool result = mojo::common::BlockingCopyToString(body.Pass(), &body_str);
   DCHECK(result);
   return body_str;
 }
 
 }  // namespace dart