Revert 216822 "Remove chrome.pak references, build resources int..."

trunk/src/chrome/app/chrome_main_delegate.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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 644 matching lines @@
 #if defined(OS_ANDROID)
     // The renderer sandbox prevents us from accessing our .pak files directly.
     // Therefore file descriptors to the .pak files that we need are passed in
     // at process creation time.
     int locale_pak_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(
         kAndroidLocalePakDescriptor);
     CHECK(locale_pak_fd != -1);
     ResourceBundle::InitSharedInstanceWithPakFile(locale_pak_fd, false);
 
     int extra_pak_keys[] = {
+      kAndroidChromePakDescriptor,
       kAndroidChrome100PercentPakDescriptor,
       kAndroidUIResourcesPakDescriptor,
     };
     for (size_t i = 0; i < arraysize(extra_pak_keys); ++i) {
       int pak_fd =
           base::GlobalDescriptors::GetInstance()->MaybeGet(extra_pak_keys[i]);
       CHECK(pak_fd != -1);
       ResourceBundle::GetSharedInstance().AddDataPackFromFile(
           pak_fd, ui::SCALE_FACTOR_100P);
     }
@@ skipping 168 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return &g_chrome_content_utility_client.Get();
 #endif
 }