Have test_content_client look for .pak file in the .apk as well as on disk

content/test/test_content_client.cc

 // Copyright (c) 2012 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 "content/test/test_content_client.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/apk_assets.h"
+#endif
+
 namespace content {
 
 TestContentClient::TestContentClient()
     : data_pack_(ui::SCALE_FACTOR_100P) {
   // content_shell.pak is not built on iOS as it is not required.
 #if !defined(OS_IOS)
   base::FilePath content_shell_pack_path;
 #if defined(OS_ANDROID)
+  base::MemoryMappedFile::Region region;
+  // Tests that don't yet use .isolate files require loading from within .apk.
+  int fd = base::android::OpenApkAsset("assets/content_shell.pak", &region);
+  if (fd >= 0) {
+    data_pack_.LoadFromFileRegion(base::File(fd), region);
+    return;

[boliu, 2015/06/29 20:24:32]

This is making the structure here super brittle. Eg someone could add something
else at the end of the constructor and totally miss the early out here.

How about instead of having a common base::FilePath, have a common base::File +
Region that's passed to LoadFromFileRegion at the end?

There's Region::kWholeFile that should work for other platforms.

[agrieve, 2015/06/29 20:38:04]

Agree. Will address in a follow-up.

+  }
+
   // on Android all pak files are inside the paks folder.
   PathService::Get(base::DIR_ANDROID_APP_DATA, &content_shell_pack_path);
   content_shell_pack_path = content_shell_pack_path.Append(
       FILE_PATH_LITERAL("paks"));
 #else
   PathService::Get(base::DIR_MODULE, &content_shell_pack_path);
 #endif
   content_shell_pack_path = content_shell_pack_path.Append(
       FILE_PATH_LITERAL("content_shell.pak"));
   data_pack_.LoadFromPath(content_shell_pack_path);
 #endif
 }
 
 TestContentClient::~TestContentClient() {
 }
 
 std::string TestContentClient::GetUserAgent() const {
   return std::string("TestContentClient");
 }
 
 base::StringPiece TestContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
   base::StringPiece resource;
   data_pack_.GetStringPiece(resource_id, &resource);
   return resource;
 }
 
 }  // namespace content