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

Side by Side Diff: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Issue 475063002: Remove no-op FLAKY_ prefix from BrowsingDataRemovalMask test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 <string> 5 #include <string>
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 "{\"protectedWeb\": true, \"extension\": true}", 345 "{\"protectedWeb\": true, \"extension\": true}",
346 PROTECTED_WEB | EXTENSION); 346 PROTECTED_WEB | EXTENSION);
347 347
348 RunBrowsingDataRemoveFunctionAndCompareOriginSetMask( 348 RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
349 ("{\"unprotectedWeb\": true, \"protectedWeb\": true, " 349 ("{\"unprotectedWeb\": true, \"protectedWeb\": true, "
350 "\"extension\": true}"), 350 "\"extension\": true}"),
351 UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION); 351 UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION);
352 } 352 }
353 353
354 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, 354 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
355 FLAKY_BrowsingDataRemovalMask) { 355 BrowsingDataRemovalMask) {
356 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask( 356 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
357 "appcache", BrowsingDataRemover::REMOVE_APPCACHE); 357 "appcache", BrowsingDataRemover::REMOVE_APPCACHE);
358 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask( 358 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
359 "cache", BrowsingDataRemover::REMOVE_CACHE); 359 "cache", BrowsingDataRemover::REMOVE_CACHE);
360 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask( 360 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
361 "cookies", BrowsingDataRemover::REMOVE_COOKIES); 361 "cookies", BrowsingDataRemover::REMOVE_COOKIES);
362 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask( 362 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
363 "downloads", BrowsingDataRemover::REMOVE_DOWNLOADS); 363 "downloads", BrowsingDataRemover::REMOVE_DOWNLOADS);
364 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask( 364 RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
365 "fileSystems", BrowsingDataRemover::REMOVE_FILE_SYSTEMS); 365 "fileSystems", BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 525
526 SetPrefsAndVerifySettings( 526 SetPrefsAndVerifySettings(
527 BrowsingDataRemover::REMOVE_COOKIES | 527 BrowsingDataRemover::REMOVE_COOKIES |
528 BrowsingDataRemover::REMOVE_HISTORY | 528 BrowsingDataRemover::REMOVE_HISTORY |
529 BrowsingDataRemover::REMOVE_DOWNLOADS, 529 BrowsingDataRemover::REMOVE_DOWNLOADS,
530 UNPROTECTED_WEB, 530 UNPROTECTED_WEB,
531 site_data_no_plugins | 531 site_data_no_plugins |
532 BrowsingDataRemover::REMOVE_HISTORY | 532 BrowsingDataRemover::REMOVE_HISTORY |
533 BrowsingDataRemover::REMOVE_DOWNLOADS); 533 BrowsingDataRemover::REMOVE_DOWNLOADS);
534 } 534 }
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