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

Side by Side Diff: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Issue 13907003: Re enable DriveFileSystemExtensionApiTest.Search. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 496
497 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, 497 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest,
498 FileBrowserHandlersLazy) { 498 FileBrowserHandlersLazy) {
499 EXPECT_TRUE(RunFileSystemExtensionApiTest( 499 EXPECT_TRUE(RunFileSystemExtensionApiTest(
500 "file_browser/handler_test_runner", 500 "file_browser/handler_test_runner",
501 FILE_PATH_LITERAL("manifest_v1.json"), 501 FILE_PATH_LITERAL("manifest_v1.json"),
502 "file_browser/file_browser_handler_lazy", 502 "file_browser/file_browser_handler_lazy",
503 FLAGS_USE_FILE_HANDLER | FLAGS_LAZY_FILE_HANDLER)) << message_; 503 FLAGS_USE_FILE_HANDLER | FLAGS_LAZY_FILE_HANDLER)) << message_;
504 } 504 }
505 505
506 #if defined(OS_CHROMEOS) 506 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, Search) {
507 #define MAYBE_Search DISABLED_Search
508 #else
509 #define MAYBE_Search Search
510 #endif
511 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, MAYBE_Search) {
512 // Configure the drive service to return only one search result at a time 507 // Configure the drive service to return only one search result at a time
513 // to simulate paginated searches. 508 // to simulate paginated searches.
514 fake_drive_service_->set_default_max_results(1); 509 fake_drive_service_->set_default_max_results(1);
515 EXPECT_TRUE(RunFileSystemExtensionApiTest( 510 EXPECT_TRUE(RunFileSystemExtensionApiTest(
516 "file_browser/drive_search_test", 511 "file_browser/drive_search_test",
517 FILE_PATH_LITERAL("manifest.json"), 512 FILE_PATH_LITERAL("manifest.json"),
518 "", 513 "",
519 FLAGS_NONE)) << message_; 514 FLAGS_NONE)) << message_;
520 } 515 }
521 516
522 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, AppFileHandler) { 517 IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, AppFileHandler) {
523 fake_drive_service_->set_default_max_results(1); 518 fake_drive_service_->set_default_max_results(1);
524 EXPECT_TRUE(RunFileSystemExtensionApiTest( 519 EXPECT_TRUE(RunFileSystemExtensionApiTest(
525 "file_browser/handler_test_runner", 520 "file_browser/handler_test_runner",
526 FILE_PATH_LITERAL("manifest_v2.json"), 521 FILE_PATH_LITERAL("manifest_v2.json"),
527 "file_browser/app_file_handler", 522 "file_browser/app_file_handler",
528 FLAGS_USE_FILE_HANDLER)) << message_; 523 FLAGS_USE_FILE_HANDLER)) << message_;
529 } 524 }
530 525
531 } // namespace 526 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698