Load net-internals resources from resources.pak.

This is the same as r50257 with 2 fixes:
1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will
work for things tests.
2) Add back the check in chrome_paths.cc to see if we're in a
mac bundle or not.

BUG=35793,42770
TEST=none

Review URL: http://codereview.chromium.org/2865010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50433 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9dca7e0..738ee3a 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -168,11 +168,6 @@ bool PathProvider(int key, FilePath* result) {
         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
@@ -250,6 +245,16 @@ bool PathProvider(int key, FilePath* result) {
 #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"));