Fix to use FilePath version of PathService::Get....

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"
@@ skipping 56 matching lines @@
 
   const std::string app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
     return FilePath();
 
   return locale_path.AppendASCII(app_locale + ".dll");
 }
 
 void ResourceBundle::LoadThemeResources() {
   DCHECK(NULL == theme_data_) << "theme dll already loaded";
-  std::wstring theme_data_path;
+  FilePath theme_data_path;
   PathService::Get(app::DIR_THEMES, &theme_data_path);
-  file_util::AppendToPath(&theme_data_path, L"default.dll");
+  theme_data_path = theme_data_path.AppendASCII("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;
+  theme_data_ = LoadLibraryEx(theme_data_path.value().c_str(), NULL,
+                              GetDataDllLoadFlags());
+  DCHECK(theme_data_ != NULL) << "unable to load " << theme_data_path.value();
 }
 
 /* static */
 bool ResourceBundle::LoadResourceBytes(
     DataHandle module,
     int resource_id,
     std::vector<unsigned char>* bytes) {
   void* data_ptr;
   size_t data_size;
   if (base::GetDataResourceFromModule(module, resource_id, &data_ptr,
@@ skipping 54 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);
 }