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

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

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 months 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 | Annotate | Revision Log
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/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 506
507 // Tests for Drive file systems in multi-profile setting. 507 // Tests for Drive file systems in multi-profile setting.
508 class MultiProfileDriveFileSystemExtensionApiTest : 508 class MultiProfileDriveFileSystemExtensionApiTest :
509 public FileSystemExtensionApiTestBase { 509 public FileSystemExtensionApiTestBase {
510 public: 510 public:
511 MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {} 511 MultiProfileDriveFileSystemExtensionApiTest() : second_profile(NULL) {}
512 512
513 virtual void SetUpOnMainThread() OVERRIDE { 513 virtual void SetUpOnMainThread() OVERRIDE {
514 base::FilePath user_data_directory; 514 base::FilePath user_data_directory;
515 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); 515 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
516 chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount, 516 chromeos::GetUserManager()->UserLoggedIn(
517 kSecondProfileHash, 517 kSecondProfileAccount, kSecondProfileHash, false);
518 false);
519 // Set up the secondary profile. 518 // Set up the secondary profile.
520 base::FilePath profile_dir = 519 base::FilePath profile_dir =
521 user_data_directory.Append( 520 user_data_directory.Append(
522 chromeos::ProfileHelper::GetUserProfileDir( 521 chromeos::ProfileHelper::GetUserProfileDir(
523 kSecondProfileHash).BaseName()); 522 kSecondProfileHash).BaseName());
524 second_profile = 523 second_profile =
525 g_browser_process->profile_manager()->GetProfile(profile_dir); 524 g_browser_process->profile_manager()->GetProfile(profile_dir);
526 525
527 FileSystemExtensionApiTestBase::SetUpOnMainThread(); 526 FileSystemExtensionApiTestBase::SetUpOnMainThread();
528 } 527 }
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 AppFileHandlerMulti) { 791 AppFileHandlerMulti) {
793 EXPECT_TRUE( 792 EXPECT_TRUE(
794 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi", 793 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi",
795 FILE_PATH_LITERAL("manifest.json"), 794 FILE_PATH_LITERAL("manifest.json"),
796 "", 795 "",
797 FLAGS_NONE)) 796 FLAGS_NONE))
798 << message_; 797 << message_;
799 } 798 }
800 } // namespace 799 } // namespace
801 } // namespace file_manager 800 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698