Files.app: Add Incognito test for file dialogs.

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index 2a8e59b7cd062ba0f43eb0cbcbc985c0d40a283d..af0f1106207e038451b1e5a3c475b520c4cd04d2 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -72,6 +72,7 @@ enum SharedOption {
 enum GuestMode {
   NOT_IN_GUEST_MODE,
   IN_GUEST_MODE,
+  IN_INCOGNITO
 };
 
 // This global operator is used from Google Test to format error messages.
@@ -586,7 +587,7 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     const GURL share_url_base(embedded_test_server()->GetURL(
         "/chromeos/file_manager/share_dialog_mock/index.html"));
-    drive_volume_ = drive_volumes_[profile()];
+    drive_volume_ = drive_volumes_[profile()->GetOriginalProfile()];
     drive_volume_->ConfigureShareUrlBase(share_url_base);
     test_util::WaitUntilDriveMountPointIsAdded(profile());
   }
@@ -598,6 +599,9 @@ void FileManagerBrowserTestBase::SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "");
     command_line->AppendSwitch(switches::kIncognito);
   }
+  if (GetGuestModeParam() == IN_INCOGNITO) {
+    command_line->AppendSwitch(switches::kIncognito);
+  }
   ExtensionApiTest::SetUpCommandLine(command_line);
 }
 
@@ -660,7 +664,7 @@ std::string FileManagerBrowserTestBase::OnMessage(const std::string& name,
     return jsonString;
   } else if (name == "isInGuestMode") {
     // Obtain whether the test is in guest mode or not.
-    return GetGuestModeParam() ? "true" : "false";
+    return GetGuestModeParam() != NOT_IN_GUEST_MODE ? "true" : "false";
   } else if (name == "getCwsWidgetContainerMockUrl") {
     // Obtain whether the test is in guest mode or not.
     const GURL url = embedded_test_server()->GetURL(
@@ -722,8 +726,9 @@ std::string FileManagerBrowserTestBase::OnMessage(const std::string& name,
 
 drive::DriveIntegrationService*
 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) {
-  drive_volumes_[profile].reset(new DriveTestVolume());
-  return drive_volumes_[profile]->CreateDriveIntegrationService(profile);
+  drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume());
+  return drive_volumes_[profile->GetOriginalProfile()]->
+      CreateDriveIntegrationService(profile);
 }
 
 // Parameter of FileManagerBrowserTest.
@@ -1039,6 +1044,10 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
                       TestParameter(IN_GUEST_MODE,
                                     "openFileDialogOnDownloads"),
                       TestParameter(NOT_IN_GUEST_MODE,
+                                    "openFileDialogOnDrive"),
+                      TestParameter(IN_INCOGNITO,
+                                    "openFileDialogOnDownloads"),
+                      TestParameter(IN_INCOGNITO,
                                     "openFileDialogOnDrive")));
 
 // Slow tests are disabled on debug build. http://crbug.com/327719