fixup! Unify ContentMainDelegateEfl and WebProcessContentMainDelegateEfl

ui::ResourceBundle::InitSharedInstanceWithPakPath is now called by
ContentMainDelegateEfl for both browser and renderer processes.
No need to explicit call it in EwkGlobalData::GetInstance anymore.

It fixes the following ASSERT failure:

#0 0x7fcf2f7795bf [0128/115917:FATAL:resource_bundle.cc(602)]
Check failed: g_shared_instance_ == NULL. ResourceBundle initialized twice
#0 0x7f4d3b6fd5bf base::debug::StackTrace::StackTrace()
#1 0x7f4d3b73eeb9 logging::LogMessage::~LogMessage()
#2 0x7f4d3e3b6697 ui::ResourceBundle::InitSharedInstance()
#3 0x7f4d3e3b4258 ui::ResourceBundle::InitSharedInstanceWithPakPath()
#4 0x7f4d3b12945b EwkGlobalData::GetInstance()
#5 0x7f4d3b0f8d6d EWebContext::EWebContext()
#6 0x7f4d3b0f8be1 EWebContext::EWebContext()
#7 0x7f4d3b19fefb Ewk_Context::Ewk_Context()
#8 0x7f4d3b19fd3d Ewk_Context::Create()
#9 0x7f4d3b19fc02 Ewk_Context::DefaultContext()
#10 0x7f4d3b1a9ebe ewk_context_default_get
#11 0x000000407f74 Browser::Browser()
#12 0x00000040c85f app_create()
#13 0x00000040cb7e main
#14 0x7f4d38a5fec5 __libc_start_main
#15 0x000000407c89 <unknown>

Original beta/m47 patch: http://165.213.202.130/gerrit/#/c/105894/

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=14350

Reviewed by: g.czajkowski

Change-Id: I7b1c9c1ba509a521c0b7c16ca534bb3579ff7032
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index 38a3560..88960a1 100644 (file)
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -130,12 +130,6 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
 
   base::ThreadRestrictions::SetIOAllowed(true);
 
-  base::FilePath pak_dir;
-  base::FilePath pak_file;
-  PathService::Get(base::DIR_EXE, &pak_dir);
-  pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
-
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) {
     content::UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
         content::CreateInProcessUtilityThread);