Remove chrome.pak references, build resources into resources.pak

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4700b5a05296a28a7e77907c44ef75432b16282b..780218906e17a6cac41f767752d5a007e11998f6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2465,16 +2465,10 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
   DCHECK(!data_path.empty());
 
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
-  base::FilePath chrome_pak = data_path.AppendASCII("chrome.pak");
-  base::PlatformFile f =
-      base::CreatePlatformFile(chrome_pak, flags, NULL, NULL);
-  DCHECK(f != base::kInvalidPlatformFileValue);
-  mappings->push_back(FileDescriptorInfo(kAndroidChromePakDescriptor,
-                                         FileDescriptor(f, true)));
-
   base::FilePath chrome_resources_pak =
       data_path.AppendASCII("chrome_100_percent.pak");
-  f = base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL);
+  base::PlatformFile f =
+      base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL);
   DCHECK(f != base::kInvalidPlatformFileValue);
   mappings->push_back(FileDescriptorInfo(kAndroidChrome100PercentPakDescriptor,
                                          FileDescriptor(f, true)));