Postpone setting up file handler's file permissions if handler is running lazy background page.

chrome/browser/chromeos/gdata/gdata_util.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/gdata/gdata_util.h"
 
 #include <string>
 #include <vector>
 #include <utility>
 
@@ skipping 166 matching lines @@
 
   // -1 to include 'gdata'.
   FilePath extracted;
   for (size_t i = arraysize(kGDataMountPointPathComponents) - 1;
        i < components.size(); ++i) {
     extracted = extracted.Append(components[i]);
   }
   return extracted;
 }
 
+void InsertGDataCachePathsPermissions(
+    Profile* profile,
+    const FilePath& gdata_path,
+    std::vector<std::pair<FilePath, int> >* cache_paths ) {
+  DCHECK(cache_paths);
 
-void SetPermissionsForGDataCacheFiles(Profile* profile,
-                                      int pid,
-                                      const FilePath& path) {
   GDataFileSystem* file_system = GetGDataFileSystem(profile);
   if (!file_system)
     return;
 
   GDataFileProperties file_properties;
-  file_system->GetFileInfoFromPath(path, &file_properties);
+  file_system->GetFileInfoFromPath(gdata_path, &file_properties);
 
   std::string resource_id = file_properties.resource_id;
   std::string file_md5 = file_properties.file_md5;
 
   // We check permissions for raw cache file paths only for read-only
   // operations (when fileEntry.file() is called), so read only permissions
   // should be sufficient for all cache paths. For the rest of supported
   // operations the file access check is done for gdata/ paths.
-  std::vector<std::pair<FilePath, int> > cache_paths;
-  cache_paths.push_back(std::make_pair(
+  cache_paths->push_back(std::make_pair(
       file_system->GetCacheFilePath(resource_id, file_md5,
           GDataRootDirectory::CACHE_TYPE_PERSISTENT,
           GDataFileSystem::CACHED_FILE_FROM_SERVER),
       kReadOnlyFilePermissions));
   // TODO(tbarzic): When we start supporting openFile operation, we may have to
   // change permission for localy modified files to match handler's permissions.
-  cache_paths.push_back(std::make_pair(
+  cache_paths->push_back(std::make_pair(
       file_system->GetCacheFilePath(resource_id, file_md5,
           GDataRootDirectory::CACHE_TYPE_PERSISTENT,
           GDataFileSystem::CACHED_FILE_LOCALLY_MODIFIED),
      kReadOnlyFilePermissions));
-  cache_paths.push_back(std::make_pair(
+  cache_paths->push_back(std::make_pair(
       file_system->GetCacheFilePath(resource_id, file_md5,
           GDataRootDirectory::CACHE_TYPE_TMP,
           GDataFileSystem::CACHED_FILE_FROM_SERVER),
       kReadOnlyFilePermissions));
 
+}
+
+void SetPermissionsForGDataCacheFiles(Profile* profile,
+                                      int pid,
+                                      const FilePath& path) {
+  std::vector<std::pair<FilePath, int> > cache_paths;
+  InsertGDataCachePathsPermissions(profile, path, &cache_paths);
   for (size_t i = 0; i < cache_paths.size(); i++) {
     content::ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile(
         pid, cache_paths[i].first, cache_paths[i].second);
   }
 }
 
 bool IsGDataAvailable(Profile* profile) {
   // We allow GData only in canary and dev channels.  http://crosbug.com/28806
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_DEV ||
       channel == chrome::VersionInfo::CHANNEL_BETA ||
       channel == chrome::VersionInfo::CHANNEL_STABLE)
     return false;
 
   // Do not allow GData for incognito windows / guest mode.
   if (profile->IsOffTheRecord())
     return false;
 
   // Disable gdata if preference is set.  This can happen with commandline flag
   // --disable-gdata or enterprise policy, or probably with user settings too
   // in the future.
   if (profile->GetPrefs()->GetBoolean(prefs::kDisableGData))
     return false;
 
   return true;
 }
 
 }  // namespace util
 }  // namespace gdata