Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / service / service_process.cc

diff --git a/src/chrome/service/service_process.cc b/src/chrome/service/service_process.cc
index 5b02bc2..fe4fe6d 100644 (file)
--- a/src/chrome/service/service_process.cc
+++ b/src/chrome/service/service_process.cc
@@ -23,12 +23,12 @@
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/service_process_util.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/service/cloud_print/cloud_print_proxy.h"
-#include "chrome/service/net/service_url_request_context.h"
+#include "chrome/service/net/service_url_request_context_getter.h"
 #include "chrome/service/service_ipc_server.h"
 #include "chrome/service/service_process_prefs.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -177,7 +177,8 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
     if (locale.empty())
       locale = kDefaultServiceProcessLocale;
   }
-  ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 
   PrepareRestartOnCrashEnviroment(command_line);