Simplify directory initialization in Files app.

chrome/browser/chromeos/file_manager/url_util_unittest.cc

 // Copyright 2013 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/file_manager/url_util.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
 
 TEST(FileManagerUrlUtilTest, GetFileManagerMainPageUrl) {
   EXPECT_EQ("chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/main.html",
             GetFileManagerMainPageUrl().spec());
 }
 
 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"));
   EXPECT_EQ("chrome-extension", url.scheme());
   EXPECT_EQ("hhaomjibdihmijegdhdafkllkbggdgoj", url.host());
   EXPECT_EQ("/main.html", url.path());
   // Confirm that "%20" is used instead of "+" in the query.
   EXPECT_TRUE(url.query().find("+") == std::string::npos);
   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",
             PrettyPrintEscapedJson(url.query()));
 }
 
 TEST(FileManagerUrlUtilTest,
      GetFileManagerMainPageUrlWithParams_WithFileTypes) {
   // Create a FileTypeInfo which looks like:
   // extensions: [["htm", "html"], ["txt"]]
   // descriptions: ["HTML", "TEXT"]
   ui::SelectFileDialog::FileTypeInfo file_types;
   file_types.extensions.push_back(std::vector<base::FilePath::StringType>());
   file_types.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
   file_types.extensions[0].push_back(FILE_PATH_LITERAL("html"));
   file_types.extensions.push_back(std::vector<base::FilePath::StringType>());
   file_types.extensions[1].push_back(FILE_PATH_LITERAL("txt"));
   file_types.extension_description_overrides.push_back(
       base::UTF8ToUTF16("HTML"));
   file_types.extension_description_overrides.push_back(
       base::UTF8ToUTF16("TEXT"));
   // "shouldReturnLocalPath" will be false if drive is supported.
   file_types.support_drive = true;
 
   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"));
   EXPECT_EQ("chrome-extension", url.scheme());
   EXPECT_EQ("hhaomjibdihmijegdhdafkllkbggdgoj", url.host());
   EXPECT_EQ("/main.html", url.path());
   // Confirm that "%20" is used instead of "+" in the query.
   EXPECT_TRUE(url.query().find("+") == std::string::npos);
   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"
             "      \"description\": \"HTML\",\n"
             "      \"extensions\": [ \"htm\", \"html\" ],\n"
             "      \"selected\": true\n"
             "   }, {\n"
             "      \"description\": \"TEXT\",\n"
             "      \"extensions\": [ \"txt\" ],\n"
             "      \"selected\": false\n"
             "   } ]\n"
             "}\n",
             PrettyPrintEscapedJson(url.query()));
 }
 
 }  // namespace
 }  // namespace util
 }  // namespace file_manager