Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fix Win GN build. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 // Tests for Drive file systems in multi-profile setting. 560 // Tests for Drive file systems in multi-profile setting.
561 class MultiProfileDriveFileSystemExtensionApiTest : 561 class MultiProfileDriveFileSystemExtensionApiTest :
562 public FileSystemExtensionApiTestBase { 562 public FileSystemExtensionApiTestBase {
563 public: 563 public:
564 MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {} 564 MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {}
565 565
566 void SetUpOnMainThread() override { 566 void SetUpOnMainThread() override {
567 base::FilePath user_data_directory; 567 base::FilePath user_data_directory;
568 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); 568 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
569 user_manager::UserManager::Get()->UserLoggedIn( 569 user_manager::UserManager::Get()->UserLoggedIn(
570 kSecondProfileAccount, kSecondProfileHash, false); 570 AccountId::FromUserEmail(kSecondProfileAccount), kSecondProfileHash,
571 false);
571 // Set up the secondary profile. 572 // Set up the secondary profile.
572 base::FilePath profile_dir = 573 base::FilePath profile_dir =
573 user_data_directory.Append( 574 user_data_directory.Append(
574 chromeos::ProfileHelper::GetUserProfileDir( 575 chromeos::ProfileHelper::GetUserProfileDir(
575 kSecondProfileHash).BaseName()); 576 kSecondProfileHash).BaseName());
576 second_profile = 577 second_profile =
577 g_browser_process->profile_manager()->GetProfile(profile_dir); 578 g_browser_process->profile_manager()->GetProfile(profile_dir);
578 579
579 FileSystemExtensionApiTestBase::SetUpOnMainThread(); 580 FileSystemExtensionApiTestBase::SetUpOnMainThread();
580 } 581 }
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 AppFileHandlerMulti) { 854 AppFileHandlerMulti) {
854 EXPECT_TRUE( 855 EXPECT_TRUE(
855 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi", 856 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi",
856 FILE_PATH_LITERAL("manifest.json"), 857 FILE_PATH_LITERAL("manifest.json"),
857 "", 858 "",
858 FLAGS_NONE)) 859 FLAGS_NONE))
859 << message_; 860 << message_;
860 } 861 }
861 } // namespace 862 } // namespace
862 } // namespace file_manager 863 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698