Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / chrome_content_browser_client_extensions_part.cc

diff --git a/src/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/src/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index 84b25f2..a807334 100644 (file)
--- a/src/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/src/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -260,7 +260,7 @@ ChromeContentBrowserClientExtensionsPart::ShouldTryToUseExistingProcessHost(
   std::vector<Profile*> profiles = g_browser_process->profile_manager()->
       GetLoadedProfiles();
   for (size_t i = 0; i < profiles.size(); ++i) {
-    ProcessManager* epm = ExtensionSystem::Get(profiles[i])->process_manager();
+    ProcessManager* epm = ProcessManager::Get(profiles[i]);
     for (ProcessManager::const_iterator iter = epm->background_hosts().begin();
          iter != epm->background_hosts().end(); ++iter) {
       const ExtensionHost* host = *iter;
@@ -532,6 +532,10 @@ void ChromeContentBrowserClientExtensionsPart::
 #if defined(ENABLE_WEBRTC)
     command_line->AppendSwitch(::switches::kEnableWebRtcHWH264Encoding);
 #endif
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableMojoSerialService)) {
+      command_line->AppendSwitch(switches::kEnableMojoSerialService);
+    }
   }
 }