Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/file_manager/external_filesystem_apitest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "google_apis/drive/time_util.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
+

[Nikita (slow), 2014/05/14 20:10:16]

nit: drop extra empty line.

[zel, 2014/05/14 21:17:57]

Done.

 // Tests for access to external file systems (as defined in
 // webkit/common/fileapi/file_system_types.h) from extensions with
 // fileBrowserPrivate and fileBrowserHandler extension permissions.
 // The tests cover following external file system types:
 // - local (kFileSystemTypeLocalNative): a local file system on which files are
 //   accessed using native local path.
 // - restricted (kFileSystemTypeRestrictedLocalNative): a *read-only* local file
 //   system which can only be accessed by extensions that have full access to
 //   external file systems (i.e. extensions with fileBrowserPrivate permission).
 // - drive (kFileSystemTypeDrive): a file system that provides access to Google
@@ skipping 20 matching lines @@
 // Root dirs for file systems expected by the test extensions.
 // NOTE: Root dir for drive file system is set by Chrome's drive implementation,
 // but the test will have to make sure the mount point is added before
 // starting a test extension using WaitUntilDriveMountPointIsAdded().
 const char kLocalMountPointName[] = "local";
 const char kRestrictedMountPointName[] = "restricted";
 
 // Default file content for the test files.
 const char kTestFileContent[] = "This is some test content.";
 
+// User account email and directory hash for secondary account for multi-profile
+// sensitive test cases.
+const char kSecondProfileAccount[] = "profile2@test.com";
+const char kSecondProfileHash[] = "fileBrowserApiTestProfile2";
+
 // Sets up the initial file system state for native local and restricted native
 // local file systems. The hierarchy is the same as for the drive file system.
 // The directory is created at unique_temp_dir/|mount_point_name| path.
 bool InitializeLocalFileSystem(std::string mount_point_name,
                                base::ScopedTempDir* tmp_dir,
                                base::FilePath* mount_point_dir) {
   if (!tmp_dir->CreateUniqueTempDir())
     return false;
 
   *mount_point_dir = tmp_dir->path().AppendASCII(mount_point_name);
@@ skipping 416 matching lines @@
       service_factory_for_test_;
 };
 
 // Tests for Drive file systems in multi-profile setting.
 class MultiProfileDriveFileSystemExtensionApiTest :
     public FileSystemExtensionApiTestBase {
  public:
   MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
+    base::FilePath user_data_directory;
+    PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
+    chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount,
+                                               kSecondProfileHash,
+                                               false);
     // Set up the secondary profile.
-    base::FilePath profile_dir;
-    base::CreateNewTempDirectory(base::FilePath::StringType(), &profile_dir);
-    profile_dir = profile_dir.AppendASCII(
-        std::string(chrome::kProfileDirPrefix) + "fileBrowserApiTestProfile2");
+    base::FilePath profile_dir =
+        user_data_directory.Append(
+            chromeos::ProfileHelper::GetUserProfileDir(
+                kSecondProfileHash).BaseName());
     second_profile =
         g_browser_process->profile_manager()->GetProfile(profile_dir);
 
     FileSystemExtensionApiTestBase::SetUpOnMainThread();
   }
 
   virtual void InitTestFileSystem() OVERRIDE {
     // This callback will get called during Profile creation.
     create_drive_integration_service_ = base::Bind(
         &MultiProfileDriveFileSystemExtensionApiTest::
@@ skipping 174 matching lines @@
   ASSERT_TRUE(AddTestHostedDocuments());
   EXPECT_TRUE(RunFileSystemExtensionApiTest(
       "file_browser/multi_profile_copy",
       FILE_PATH_LITERAL("manifest.json"),
       "",
       FLAGS_NONE)) << message_;
 }
 
 }  // namespace
 }  // namespace file_manager