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

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

Issue 10830255: Re-enable RemoteFileSystemExtensionApiTest.ContentSearch on ASAN bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 317
318 // On exit, all operations in progress should be cancelled. 318 // On exit, all operations in progress should be cancelled.
319 EXPECT_CALL(*mock_documents_service_, CancelAll()); 319 EXPECT_CALL(*mock_documents_service_, CancelAll());
320 320
321 // All is set... RUN THE TEST. 321 // All is set... RUN THE TEST.
322 EXPECT_TRUE(RunExtensionTest("filesystem_handler")) << message_; 322 EXPECT_TRUE(RunExtensionTest("filesystem_handler")) << message_;
323 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote.html", 323 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote.html",
324 kComponentFlags)) << message_; 324 kComponentFlags)) << message_;
325 } 325 }
326 326
327 // This test fails under AddressSanitizer, see http://crbug.com/136169. 327 IN_PROC_BROWSER_TEST_F(RemoteFileSystemExtensionApiTest, ContentSearch) {
328 #if defined(ADDRESS_SANITIZER)
329 #define MAYBE_ContentSearch DISABLED_ContentSearch
330 #else
331 #define MAYBE_ContentSearch ContentSearch
332 #endif
333 IN_PROC_BROWSER_TEST_F(RemoteFileSystemExtensionApiTest,
334 MAYBE_ContentSearch) {
335 EXPECT_CALL(*mock_documents_service_, GetAccountMetadata(_)).Times(1); 328 EXPECT_CALL(*mock_documents_service_, GetAccountMetadata(_)).Times(1);
336 329
337 // First, test will get drive root directory, to init file system. 330 // First, test will get drive root directory, to init file system.
338 scoped_ptr<base::Value> documents_value(LoadJSONFile(kTestRootFeed)); 331 scoped_ptr<base::Value> documents_value(LoadJSONFile(kTestRootFeed));
339 EXPECT_CALL(*mock_documents_service_, 332 EXPECT_CALL(*mock_documents_service_,
340 GetDocuments(_, _, "", _, _)) 333 GetDocuments(_, _, "", _, _))
341 .WillOnce(MockGetDocumentsCallback(gdata::HTTP_SUCCESS, 334 .WillOnce(MockGetDocumentsCallback(gdata::HTTP_SUCCESS,
342 &documents_value)); 335 &documents_value));
343 336
344 // We return the whole test file system in serch results. 337 // We return the whole test file system in serch results.
(...skipping 18 matching lines...) Expand all
363 _, _)) 356 _, _))
364 .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS)); 357 .WillOnce(MockDownloadFileCallback(gdata::HTTP_SUCCESS));
365 358
366 // On exit, all operations in progress should be cancelled. 359 // On exit, all operations in progress should be cancelled.
367 EXPECT_CALL(*mock_documents_service_, CancelAll()); 360 EXPECT_CALL(*mock_documents_service_, CancelAll());
368 361
369 // All is set... RUN THE TEST. 362 // All is set... RUN THE TEST.
370 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html", 363 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
371 kComponentFlags)) << message_; 364 kComponentFlags)) << message_;
372 } 365 }
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