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

Unified Diff: chrome/browser/extensions/api/file_system/file_system_apitest.cc

Issue 265013002: Revert of Enable Enterprise enrollment on desktop builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/file_system/file_system_apitest.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
index ac32e37224f3ef2878cd25df10c35859b4f803dc..fee48ef7674875afa9ed3e0acc90ddde5f8808df 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -152,7 +152,7 @@
#if defined(OS_WIN) || defined(OS_POSIX)
IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiGetDisplayPathPrettify) {
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(base::DIR_HOME,
- test_root_folder_, false, false));
+ test_root_folder_, false));
base::FilePath test_file = test_root_folder_.AppendASCII("gold.txt");
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
@@ -212,7 +212,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
+ chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false));
FileSystemChooseEntryFunction::
SkipPickerAndSelectSuggestedPathForTest();
{
@@ -232,7 +232,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
+ chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false));
FileSystemChooseEntryFunction::
SkipPickerAndSelectSuggestedPathForTest();
ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_existing"))
@@ -244,7 +244,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
+ chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false));
FileSystemChooseEntryFunction::SkipPickerAndSelectSuggestedPathForTest();
ASSERT_TRUE(RunPlatformAppTest(
"api_test/file_system/open_multiple_with_suggested_name"))
@@ -323,7 +323,7 @@
ASSERT_FALSE(test_file.empty());
base::FilePath test_directory = test_file.DirName();
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- kGraylistedPath, test_directory, false, false));
+ kGraylistedPath, test_directory, false));
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
&test_directory);
ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_directory"))
@@ -338,7 +338,7 @@
ASSERT_FALSE(test_file.empty());
base::FilePath test_directory = test_file.DirName();
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- kGraylistedPath, test_directory, false, false));
+ kGraylistedPath, test_directory, false));
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
&test_directory);
ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_directory_cancel"))
@@ -354,7 +354,7 @@
base::FilePath test_directory = test_file.DirName();
base::FilePath parent_directory = test_directory.DirName();
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- kGraylistedPath, test_directory, false, false));
+ kGraylistedPath, test_directory, false));
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
&parent_directory);
ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_directory_cancel"))
@@ -373,7 +373,7 @@
base::FilePath test_directory = test_file.DirName();
base::FilePath parent_directory = test_directory.DirName();
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
- kGraylistedPath, parent_directory, false, false));
+ kGraylistedPath, parent_directory, false));
FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
&test_directory);
ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_directory"))
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698