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

Unified Diff: chrome/browser/chromeos/file_manager/url_util_unittest.cc

Issue 144783002: Simplify directory initialization in Files app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up. Created 6 years, 11 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
Index: chrome/browser/chromeos/file_manager/url_util_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/url_util_unittest.cc b/chrome/browser/chromeos/file_manager/url_util_unittest.cc
index 402d210da611326465aa428231e421414ff87bb8..cd24c18d9c68e7fca934b0e2b117d1ce86ba3d62 100644
--- a/chrome/browser/chromeos/file_manager/url_util_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/url_util_unittest.cc
@@ -43,7 +43,8 @@ TEST(FileManagerUrlUtilTest, GetFileManagerMainPageUrlWithParams_NoFileTypes) {
const GURL url = GetFileManagerMainPageUrlWithParams(
ui::SelectFileDialog::SELECT_OPEN_FILE,
base::UTF8ToUTF16("some title"),
- base::FilePath::FromUTF8Unsafe("foo.txt"),
+ base::FilePath::FromUTF8Unsafe("/Downloads"),
+ base::FilePath::FromUTF8Unsafe("/Downloads/foo.txt"),
NULL, // No file types
0, // Hence no file type index.
FILE_PATH_LITERAL("txt"));
@@ -55,9 +56,11 @@ TEST(FileManagerUrlUtilTest, GetFileManagerMainPageUrlWithParams_NoFileTypes) {
EXPECT_TRUE(url.query().find("%20") != std::string::npos);
// The escaped query is hard to read. Pretty print the escaped JSON.
EXPECT_EQ("{\n"
+ " \"currentDirectoryPath\": \"/Downloads\",\n"
" \"defaultExtension\": \"txt\",\n"
- " \"defaultPath\": \"foo.txt\",\n"
+ " \"selectionPath\": \"/Downloads/foo.txt\",\n"
" \"shouldReturnLocalPath\": true,\n"
+ " \"targetName\": \"foo.txt\",\n"
" \"title\": \"some title\",\n"
" \"type\": \"open-file\"\n"
"}\n",
@@ -85,7 +88,8 @@ TEST(FileManagerUrlUtilTest,
const GURL url = GetFileManagerMainPageUrlWithParams(
ui::SelectFileDialog::SELECT_OPEN_FILE,
base::UTF8ToUTF16("some title"),
- base::FilePath::FromUTF8Unsafe("foo.txt"),
+ base::FilePath::FromUTF8Unsafe("/Downloads"),
+ base::FilePath::FromUTF8Unsafe("/Downloads/foo.txt"),
&file_types,
1, // The file type index is 1-based.
FILE_PATH_LITERAL("txt"));
@@ -97,10 +101,12 @@ TEST(FileManagerUrlUtilTest,
EXPECT_TRUE(url.query().find("%20") != std::string::npos);
// The escaped query is hard to read. Pretty print the escaped JSON.
EXPECT_EQ("{\n"
+ " \"currentDirectoryPath\": \"/Downloads\",\n"
" \"defaultExtension\": \"txt\",\n"
- " \"defaultPath\": \"foo.txt\",\n"
" \"includeAllFiles\": false,\n"
+ " \"selectionPath\": \"/Downloads/foo.txt\",\n"
" \"shouldReturnLocalPath\": false,\n"
+ " \"targetName\": \"foo.txt\",\n"
" \"title\": \"some title\",\n"
" \"type\": \"open-file\",\n"
" \"typeList\": [ {\n"
« no previous file with comments | « chrome/browser/chromeos/file_manager/url_util.cc ('k') | chrome/browser/resources/file_manager/background/js/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698