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

Side by Side Diff: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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 | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | 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 "chrome/browser/browsing_data/cookies_tree_model.h" 5 #include "chrome/browser/browsing_data/cookies_tree_model.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h" 10 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
11 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h" 11 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
12 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h" 12 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
13 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h" 13 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
14 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h" 14 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h"
15 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h" 15 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
16 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h " 16 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h "
17 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h" 17 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
18 #include "chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_help er.h" 18 #include "chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_help er.h"
19 #include "chrome/browser/content_settings/cookie_settings.h" 19 #include "chrome/browser/content_settings/cookie_settings.h"
20 #include "chrome/browser/content_settings/host_content_settings_map.h" 20 #include "chrome/browser/content_settings/host_content_settings_map.h"
21 #include "chrome/browser/content_settings/mock_settings_observer.h" 21 #include "chrome/browser/content_settings/mock_settings_observer.h"
22 #include "chrome/browser/extensions/extension_special_storage_policy.h" 22 #include "chrome/browser/extensions/extension_special_storage_policy.h"
23 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/test/base/testing_profile.h" 24 #include "chrome/test/base/testing_profile.h"
24 #include "content/public/browser/notification_details.h" 25 #include "content/public/browser/notification_details.h"
25 #include "content/public/browser/notification_types.h" 26 #include "content/public/browser/notification_types.h"
26 #include "content/public/test/test_browser_thread.h" 27 #include "content/public/test/test_browser_thread.h"
27 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
28 #include "net/url_request/url_request_context_getter.h" 29 #include "net/url_request/url_request_context_getter.h"
29 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
30 31
31 #include "base/utf_string_conversions.h" 32 #include "base/utf_string_conversions.h"
32 33
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model)); 1192 EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model));
1192 1193
1193 cookies_model.UpdateSearchResults(string16(ASCIIToUTF16("foo3"))); 1194 cookies_model.UpdateSearchResults(string16(ASCIIToUTF16("foo3")));
1194 EXPECT_EQ("D", GetDisplayedCookies(&cookies_model)); 1195 EXPECT_EQ("D", GetDisplayedCookies(&cookies_model));
1195 1196
1196 cookies_model.UpdateSearchResults(string16()); 1197 cookies_model.UpdateSearchResults(string16());
1197 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model)); 1198 EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
1198 } 1199 }
1199 1200
1200 } // namespace 1201 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/browser_shutdown.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698