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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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"
11 #include "base/strings/pattern.h" 10 #include "base/strings/pattern.h"
12 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
13 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/browsing_data/browsing_data_helper.h" 14 #include "chrome/browser/browsing_data/browsing_data_helper.h"
16 #include "chrome/browser/browsing_data/browsing_data_remover.h" 15 #include "chrome/browser/browsing_data/browsing_data_remover.h"
17 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" 16 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
18 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h" 17 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
19 #include "chrome/browser/extensions/extension_function_test_utils.h" 18 #include "chrome/browser/extensions/extension_function_test_utils.h"
20 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "components/prefs/pref_service.h"
24 24
25 using extension_function_test_utils::RunFunctionAndReturnError; 25 using extension_function_test_utils::RunFunctionAndReturnError;
26 using extension_function_test_utils::RunFunctionAndReturnSingleResult; 26 using extension_function_test_utils::RunFunctionAndReturnSingleResult;
27 27
28 namespace { 28 namespace {
29 29
30 enum OriginTypeMask { 30 enum OriginTypeMask {
31 UNPROTECTED_WEB = BrowsingDataHelper::UNPROTECTED_WEB, 31 UNPROTECTED_WEB = BrowsingDataHelper::UNPROTECTED_WEB,
32 PROTECTED_WEB = BrowsingDataHelper::PROTECTED_WEB, 32 PROTECTED_WEB = BrowsingDataHelper::PROTECTED_WEB,
33 EXTENSION = BrowsingDataHelper::EXTENSION 33 EXTENSION = BrowsingDataHelper::EXTENSION
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 SetPrefsAndVerifySettings( 540 SetPrefsAndVerifySettings(
541 BrowsingDataRemover::REMOVE_COOKIES | 541 BrowsingDataRemover::REMOVE_COOKIES |
542 BrowsingDataRemover::REMOVE_HISTORY | 542 BrowsingDataRemover::REMOVE_HISTORY |
543 BrowsingDataRemover::REMOVE_DOWNLOADS, 543 BrowsingDataRemover::REMOVE_DOWNLOADS,
544 UNPROTECTED_WEB, 544 UNPROTECTED_WEB,
545 site_data_no_plugins | 545 site_data_no_plugins |
546 BrowsingDataRemover::REMOVE_HISTORY | 546 BrowsingDataRemover::REMOVE_HISTORY |
547 BrowsingDataRemover::REMOVE_DOWNLOADS); 547 BrowsingDataRemover::REMOVE_DOWNLOADS);
548 } 548 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/bookmarks/bookmarks_api.cc ('k') | chrome/browser/extensions/api/commands/command_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698