ProfileManager doesn't depend on "--login-profile" switch.

chrome/browser/chromeos/drive/file_system_util_unittest.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/drive/file_system_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/chrome_constants.h"

[mtomasz, 2014/08/22 05:43:40]

The chrome_constants.h include is not used anymore. Please remove.

[dzhioev (left Google), 2014/08/25 17:39:11]

Done.

 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_file_system_options.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
@@ skipping 11 matching lines @@
 class ProfileRelatedFileSystemUtilTest : public testing::Test {
  protected:
   ProfileRelatedFileSystemUtilTest()
       : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(testing_profile_manager_.SetUp());
   }
 
   Profile* CreateProfileWithName(const std::string& name) {

[mtomasz, 2014/08/22 05:43:40]

nit: This utility method became trivial, so we should remove it.

[dzhioev (left Google), 2014/08/25 17:39:11]

Done.

-    return testing_profile_manager_.CreateTestingProfile(
-        chrome::kProfileDirPrefix + name);
+    return testing_profile_manager_.CreateTestingProfile(name);
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfileManager testing_profile_manager_;
 };
 
 }  // namespace
 
 TEST(FileSystemUtilTest, FilePathToDriveURL) {
@@ skipping 15 matching lines @@
   // Path with multi byte characters.
   base::string16 utf16_string;
   utf16_string.push_back(0x307b);  // HIRAGANA_LETTER_HO
   utf16_string.push_back(0x3052);  // HIRAGANA_LETTER_GE
   path = GetDriveMyDriveRootPath().Append(
       base::FilePath::FromUTF8Unsafe(base::UTF16ToUTF8(utf16_string) + ".txt"));
   EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
 }
 
 TEST_F(ProfileRelatedFileSystemUtilTest, GetDriveMountPointPath) {
-  Profile* profile = CreateProfileWithName("hash1");
-  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("/special/drive-hash1"),
+  Profile* profile = CreateProfileWithName("user1");
+  std::string user_id_hash =
+      chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user1");
+  EXPECT_EQ(base::FilePath::FromUTF8Unsafe("/special/drive-" + user_id_hash),
             GetDriveMountPointPath(profile));
 }
 
 TEST_F(ProfileRelatedFileSystemUtilTest, ExtractProfileFromPath) {
-  Profile* profile1 = CreateProfileWithName("hash1");
-  Profile* profile2 = CreateProfileWithName("hash2");
-  EXPECT_EQ(profile1, ExtractProfileFromPath(
-      base::FilePath::FromUTF8Unsafe("/special/drive-hash1")));
-  EXPECT_EQ(profile2, ExtractProfileFromPath(
-      base::FilePath::FromUTF8Unsafe("/special/drive-hash2/root/xxx")));
+  Profile* profile1 = CreateProfileWithName("user1");
+  Profile* profile2 = CreateProfileWithName("user2");
+  std::string user1_id_hash =

[mtomasz, 2014/08/22 05:43:40]

optional: const would be nice, but it seems that it is not used in this file, so
maybe better to keep consistency.

[dzhioev (left Google), 2014/08/25 17:39:11]

Done.

+      chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user1");
+  std::string user2_id_hash =
+      chromeos::ProfileHelper::GetUserIdHashByUserIdForTesting("user2");
+  EXPECT_EQ(profile1,
+            ExtractProfileFromPath(base::FilePath::FromUTF8Unsafe(
+                "/special/drive-" + user1_id_hash)));
+  EXPECT_EQ(profile2,
+            ExtractProfileFromPath(base::FilePath::FromUTF8Unsafe(
+                "/special/drive-" + user2_id_hash + "/root/xxx")));
   EXPECT_EQ(NULL, ExtractProfileFromPath(
       base::FilePath::FromUTF8Unsafe("/special/non-drive-path")));
 }
 
 TEST(FileSystemUtilTest, IsUnderDriveMountPoint) {
   EXPECT_FALSE(IsUnderDriveMountPoint(
       base::FilePath::FromUTF8Unsafe("/wherever/foo.txt")));
   EXPECT_FALSE(IsUnderDriveMountPoint(
       base::FilePath::FromUTF8Unsafe("/special/foo.txt")));
   EXPECT_FALSE(IsUnderDriveMountPoint(
@@ skipping 178 matching lines @@
   // Non GDoc file.
   file = temp_dir.path().AppendASCII("test.txt");
   std::string data = "Hello world!";
   EXPECT_TRUE(google_apis::test_util::WriteStringToFile(file, data));
   EXPECT_TRUE(ReadUrlFromGDocFile(file).is_empty());
   EXPECT_TRUE(ReadResourceIdFromGDocFile(file).empty());
 }
 
 }  // namespace util
 }  // namespace drive