Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resou...

chrome/common/chrome_paths.cc

 // Copyright (c) 2006-2010 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/common/chrome_paths.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 150 matching lines @@
     case chrome::DIR_BOOKMARK_MANAGER:
       if (!PathService::Get(chrome::DIR_RESOURCES, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("bookmark_manager"));
       break;
     case chrome::DIR_INSPECTOR:
       if (!PathService::Get(chrome::DIR_RESOURCES, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("inspector"));
       break;
+    case chrome::DIR_NET_INTERNALS:
+      if (!PathService::Get(chrome::DIR_RESOURCES, &cur))
+        return false;
+      cur = cur.Append(FILE_PATH_LITERAL("net_internals"));
+      break;
     case chrome::DIR_APP_DICTIONARIES:
 #if defined(OS_LINUX) || defined(OS_MACOSX)
       // We can't write into the EXE dir on Linux, so keep dictionaries
       // alongside the safe browsing database in the user data dir.
       // And we don't want to write into the bundle on the Mac, so push
       // it to the user data dir there also.
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
 #else
       if (!PathService::Get(base::DIR_EXE, &cur))
@@ skipping 57 matching lines @@
         return false;
 #if defined(OS_WIN)
       cur = cur.Append(FILE_PATH_LITERAL("pdf.dll"));
 #elif defined(OS_MACOSX)
       cur = cur.Append(FILE_PATH_LITERAL("PDF.plugin"));
 #else  // Linux and Chrome OS
       cur = cur.Append(FILE_PATH_LITERAL("libpdf.so"));
 #endif
       break;
     case chrome::FILE_RESOURCES_PACK:
-#if defined(OS_MACOSX)
-      if (mac_util::AmIBundled()) {
-        cur = mac_util::MainAppBundlePath();
-        cur = cur.Append(FILE_PATH_LITERAL("Resources"))
-                 .Append(FILE_PATH_LITERAL("resources.pak"));
-        break;
-      }
-      // If we're not bundled on mac, resources.pak should be next to the
-      // binary (e.g., for unit tests).
-#endif
       if (!PathService::Get(base::DIR_EXE, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
       break;
 #if defined(OS_CHROMEOS)
     case chrome::FILE_CHROMEOS_API:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("chromeos"));
       cur = cur.Append(FILE_PATH_LITERAL("libcros.so"));
@@ skipping 32 matching lines @@
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome