Use incognito split for ChromeVox and TTS in Guest mode

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 6c5292970d28ab20b762ebc86c9e0ab35cf64735..46f100c3fef21750850eb5cb22dc225ef60ec1c7 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -183,9 +183,22 @@ std::string ComponentLoader::Add(const std::string& manifest_contents,
   return std::string();
 }
 
-std::string ComponentLoader::Add(const base::DictionaryValue* parsed_manifest,
+std::string ComponentLoader::Add(base::DictionaryValue* parsed_manifest,
                                  const base::FilePath& root_directory) {
   ComponentExtensionInfo info(parsed_manifest, root_directory);
+#if defined(OS_CHROMEOS)
+  // Force incognito split in Guest mode for some component extensions.
+  // In Guest mode non-incognito background pages are not allowed so
+  // split mode is required.
+  if (info.extension_id == extension_misc::kChromeVoxExtensionId ||
+      info.extension_id == extension_misc::kSpeechSynthesisExtensionId) {
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
+      parsed_manifest->SetString(manifest_keys::kIncognito,
+                                 manifest_values::kIncognitoSplit);
+    }
+  }
+#endif

[asargent_no_longer_on_chrome, 2014/02/06 00:58:02]

It seems a little hacky to inject a value into the parsed manifest like this - I
can see someone in the future not knowing about this corner of code getting
confused and/or breaking something because they were looking at the manifest in
the resources file and assuming that's what we're actually loading. 

Didn't we already fix this in a different way for the file manager?

[Dmitry Polukhin, 2014/02/06 01:30:21]

I'm not aware of the fix for the file manager. Do you know where is it?

For most other apps like QuickOffice and Feedback we just added incognito:split
into the manifest file. But I can't do it for ChromeVox and TTS because it
breaks normal case when incognito profile is loaded (two background pages for
such system wide things can't coexist). I would love to fix it another way but
so far it the simplest approach that works. We will need to merge in into M33 to
fix regression. Alternative approach is to create two manifest files one for
normal case and another one for Guest mode. I choose this approach to avoid
problem with duplicating manifest files.

Also there is bug about Japanese keyboard that is extension
(https://code.google.com/p/chromium/issues/detail?id=339318), I suspect it is
the same root cause.

   component_extensions_.push_back(info);
   if (extension_service_->is_ready())
     Load(info);
@@ -326,8 +339,9 @@ void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
 
 #if defined(OS_CHROMEOS)
 void ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
-  Add(IDR_SPEECH_SYNTHESIS_MANIFEST,
+  std::string id = Add(IDR_SPEECH_SYNTHESIS_MANIFEST,
       base::FilePath(extension_misc::kSpeechSynthesisExtensionPath));
+  EnbaleFileSystemInGuestMode(id);
 }
 #endif
 
@@ -480,21 +494,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
             chromeos::switches::kDisableQuickofficeComponentApp)) {
       std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath(
           FILE_PATH_LITERAL("/usr/share/chromeos-assets/quick_office")));
-      if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
-        // TODO(dpolukhin): Hack to enable HTML5 temporary file system for
-        // Quickoffice. It doesn't work without temporary file system access.
-        // Make sure temporary file system is enabled in the off the record
-        // browser context (as that is the one used in guest session).
-        content::BrowserContext* off_the_record_context =
-            ExtensionsBrowserClient::Get()->GetOffTheRecordContext(
-                browser_context_);
-        GURL site = content::SiteInstance::GetSiteForURL(
-            off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
-        fileapi::FileSystemContext* file_system_context =
-            content::BrowserContext::GetStoragePartitionForSite(
-                off_the_record_context, site)->GetFileSystemContext();
-        file_system_context->EnableTemporaryFileSystemInIncognito();
-      }
+      EnbaleFileSystemInGuestMode(id);
     }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
@@ -599,4 +599,25 @@ void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   }
 }
 
+void ComponentLoader::EnbaleFileSystemInGuestMode(const std::string& id) {
+#if defined(OS_CHROMEOS)
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(chromeos::switches::kGuestSession)) {
+    // TODO(dpolukhin): Hack to enable HTML5 temporary file system for
+    // the extension. Some component extensions don't work without temporary
+    // file system access. Make sure temporary file system is enabled in the off
+    // the record browser context (as that is the one used in guest session).
+    content::BrowserContext* off_the_record_context =
+        ExtensionsBrowserClient::Get()->GetOffTheRecordContext(
+            browser_context_);
+    GURL site = content::SiteInstance::GetSiteForURL(
+        off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
+    fileapi::FileSystemContext* file_system_context =
+        content::BrowserContext::GetStoragePartitionForSite(
+            off_the_record_context, site)->GetFileSystemContext();
+    file_system_context->EnableTemporaryFileSystemInIncognito();
+  }
+#endif
+}
+
 }  // namespace extensions