OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
6 #include "chrome/browser/chromeos/drive/file_system_util.h" | 6 #include "chrome/browser/chromeos/drive/file_system_util.h" |
7 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 7 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
8 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 8 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
9 #include "chrome/browser/signin/signin_manager_factory.h" | 9 #include "chrome/browser/signin/signin_manager_factory.h" |
10 #include "chromeos/chromeos_switches.h" | 10 #include "chromeos/chromeos_switches.h" |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 "renameDirectoryFromDirectoryTreeWithKeyboardShortcut"), | 198 "renameDirectoryFromDirectoryTreeWithKeyboardShortcut"), |
199 TestParameter(IN_GUEST_MODE, | 199 TestParameter(IN_GUEST_MODE, |
200 "renameDirectoryFromDirectoryTreeWithKeyboardShortcut"), | 200 "renameDirectoryFromDirectoryTreeWithKeyboardShortcut"), |
201 TestParameter(NOT_IN_GUEST_MODE, | 201 TestParameter(NOT_IN_GUEST_MODE, |
202 "renameDirectoryToEmptyStringFromDirectoryTree"), | 202 "renameDirectoryToEmptyStringFromDirectoryTree"), |
203 TestParameter(IN_GUEST_MODE, | 203 TestParameter(IN_GUEST_MODE, |
204 "renameDirectoryToEmptyStringFromDirectoryTree"), | 204 "renameDirectoryToEmptyStringFromDirectoryTree"), |
205 TestParameter(NOT_IN_GUEST_MODE, | 205 TestParameter(NOT_IN_GUEST_MODE, |
206 "renameDirectoryToExistingOneFromDirectoryTree"), | 206 "renameDirectoryToExistingOneFromDirectoryTree"), |
207 TestParameter(IN_GUEST_MODE, | 207 TestParameter(IN_GUEST_MODE, |
208 "renameDirectoryToExistingOneFromDirectoryTree"))); | 208 "renameDirectoryToExistingOneFromDirectoryTree"), |
| 209 TestParameter(NOT_IN_GUEST_MODE, |
| 210 "createDirectoryFromDirectoryTreeWithContextMenu"), |
| 211 TestParameter(NOT_IN_GUEST_MODE, |
| 212 "createDirectoryFromDirectoryTreeWithKeyboardShortcut"))); |
209 | 213 |
210 // Fails on official build. http://crbug.com/429294 | 214 // Fails on official build. http://crbug.com/429294 |
211 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) | 215 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) |
212 #define MAYBE_DriveSpecific DISABLED_DriveSpecific | 216 #define MAYBE_DriveSpecific DISABLED_DriveSpecific |
213 #else | 217 #else |
214 #define MAYBE_DriveSpecific DriveSpecific | 218 #define MAYBE_DriveSpecific DriveSpecific |
215 #endif | 219 #endif |
216 WRAPPED_INSTANTIATE_TEST_CASE_P( | 220 WRAPPED_INSTANTIATE_TEST_CASE_P( |
217 MAYBE_DriveSpecific, | 221 MAYBE_DriveSpecific, |
218 FileManagerBrowserTest, | 222 FileManagerBrowserTest, |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 | 641 |
638 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { | 642 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { |
639 AddAllUsers(); | 643 AddAllUsers(); |
640 | 644 |
641 // Sanity check that normal operations work in multi-profile setting as well. | 645 // Sanity check that normal operations work in multi-profile setting as well. |
642 set_test_case_name("keyboardCopyDrive"); | 646 set_test_case_name("keyboardCopyDrive"); |
643 StartTest(); | 647 StartTest(); |
644 } | 648 } |
645 | 649 |
646 } // namespace file_manager | 650 } // namespace file_manager |
OLD | NEW |