Reland this change. Registers paths for the testing exe, too....

app/resource_bundle_win.cc

 // Copyright (c) 2006-2008 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 "app/resource_bundle.h"
 
 #include <atlbase.h>
 
+#include "app/app_paths.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"
 #include "base/string_piece.h"
 #include "base/win_util.h"
-#include "chrome/common/chrome_paths.h"
 
 namespace {
 
 // Returns the flags that should be passed to LoadLibraryEx.
 DWORD GetDataDllLoadFlags() {
   if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
     return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE;
 
   return DONT_RESOLVE_DLL_REFERENCES;
 }
@@ skipping 28 matching lines @@
 
   // The dll should only have resources, not executable code.
   locale_resources_data_ = LoadLibraryEx(locale_path.value().c_str(), NULL,
                                          GetDataDllLoadFlags());
   DCHECK(locale_resources_data_ != NULL) <<
       "unable to load generated resources";
 }
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
-  PathService::Get(chrome::DIR_LOCALES, &locale_path);
+  PathService::Get(app::DIR_LOCALES, &locale_path);
 
   const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
     return FilePath();
 
   return locale_path.Append(app_locale + L".dll");
 }
 
 void ResourceBundle::LoadThemeResources() {
   DCHECK(NULL == theme_data_) << "theme dll already loaded";
   std::wstring theme_data_path;
-  PathService::Get(chrome::DIR_THEMES, &theme_data_path);
+  PathService::Get(app::DIR_THEMES, &theme_data_path);
   file_util::AppendToPath(&theme_data_path, L"default.dll");
 
   // The dll should only have resources, not executable code.
   theme_data_ = LoadLibraryEx(theme_data_path.c_str(), NULL,
                              GetDataDllLoadFlags());
   DCHECK(theme_data_ != NULL) << "unable to load " << theme_data_path;
 }
 
 /* static */
 bool ResourceBundle::LoadResourceBytes(
@@ skipping 60 matching lines @@
     image = AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(),
                                       message_id);
     if (!image) {
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
   // Copy into a string16 and return.
   return string16(image->achString, image->nLength);
 }