chrome: Include headless resources

headless/lib/headless_content_main_delegate.cc

 // Copyright 2015 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 "headless/lib/headless_content_main_delegate.h"
 
 #include "base/command_line.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "headless/lib/browser/headless_browser_impl.h"
 #include "headless/lib/browser/headless_content_browser_client.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
@@ skipping 84 matching lines @@
   // TODO(skyostil): Disable the zygote host.
 }
 
 // static
 HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() {
   return g_current_headless_content_main_delegate;
 }
 
 // static
 void HeadlessContentMainDelegate::InitializeResourceBundle() {
+  base::FilePath dir_module;
   base::FilePath pak_file;
-  bool result = PathService::Get(base::DIR_MODULE, &pak_file);
+  bool result = PathService::Get(base::DIR_MODULE, &dir_module);
   DCHECK(result);
-  pak_file = pak_file.Append(FILE_PATH_LITERAL("headless_lib.pak"));
+  // Try loading the headless library pak file first. If it doesn't exist (i.e.,
+  // when we're running with the --headless switch), fall back to the browser's
+  // resource pak.
+  pak_file = dir_module.Append(FILE_PATH_LITERAL("headless_lib.pak"));
+  if (!base::PathExists(pak_file))
+    pak_file = dir_module.Append(FILE_PATH_LITERAL("resources.pak"));
+  // TODO(skyostil): Use the locale-based loader instead.
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
 content::ContentBrowserClient*
 HeadlessContentMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new HeadlessContentBrowserClient(browser_.get()));
   return browser_client_.get();
 }
 
 }  // namespace headless