Add check for fallback on resources folder, in case that it was already found (e.g. in browsertests…

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/base_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
@@ skipping 232 matching lines @@
   ui::ResourceBundle::InitSharedInstanceWithLocale(
       locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
 
 #ifdef HEADLESS_USE_EMBEDDED_RESOURCES
   ResourceBundle::GetSharedInstance().AddDataPackFromBuffer(
       base::StringPiece(
           reinterpret_cast<const char*>(kHeadlessResourcePak.contents),
           kHeadlessResourcePak.length),
       ui::SCALE_FACTOR_NONE);
 #else
-#if defined(OS_MACOSX) && !defined(COMPONENT_BUILD)
-  dir_module = dir_module.Append(FILE_PATH_LITERAL("Resources/"));
-#endif
   // 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"));
+#if defined(OS_MACOSX) && !defined(COMPONENT_BUILD)
+  // In non component builds, check if fall back in Resources/ folder is
+  // available.
+  if (!base::PathExists(pak_file))
+    pak_file = dir_module.Append(FILE_PATH_LITERAL("Resources/resources.pak"));
+#endif
   ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       pak_file, ui::SCALE_FACTOR_NONE);
 #endif
 }
 
 content::ContentBrowserClient*
 HeadlessContentMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new HeadlessContentBrowserClient(browser_.get()));
   return browser_client_.get();
 }
 
 }  // namespace headless