chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/custom_handlers/protocol_handler_registry.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/auto_reset.h"	5 #include "base/auto_reset.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/json/json_reader.h"	7 #include "base/json/json_reader.h"

8 #include "base/json/json_writer.h"	8 #include "base/json/json_writer.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

	10 #include "base/prefs/pref_service.h"

10 #include "chrome/browser/content_settings/content_settings_details.h"	11 #include "chrome/browser/content_settings/content_settings_details.h"

11 #include "chrome/browser/content_settings/cookie_settings.h"	12 #include "chrome/browser/content_settings/cookie_settings.h"

12 #include "chrome/browser/content_settings/host_content_settings_map.h"	13 #include "chrome/browser/content_settings/host_content_settings_map.h"

13 #include "chrome/browser/content_settings/mock_settings_observer.h"	14 #include "chrome/browser/content_settings/mock_settings_observer.h"

14 #include "chrome/browser/prefs/pref_service.h"

15 #include "chrome/browser/prefs/scoped_user_pref_update.h"	15 #include "chrome/browser/prefs/scoped_user_pref_update.h"

16 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

17 #include "chrome/common/pref_names.h"	17 #include "chrome/common/pref_names.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

19 #include "chrome/test/base/testing_pref_service.h"	19 #include "chrome/test/base/testing_pref_service.h"

20 #include "chrome/test/base/testing_profile.h"	20 #include "chrome/test/base/testing_profile.h"

21 #include "content/public/test/test_browser_thread.h"	21 #include "content/public/test/test_browser_thread.h"

22 #include "googleurl/src/gurl.h"	22 #include "googleurl/src/gurl.h"

23 #include "net/base/static_cookie_policy.h"	23 #include "net/base/static_cookie_policy.h"

24 #include "testing/gtest/include/gtest/gtest.h"	24 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 1055 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1080 GURL("http://other.com"),	1080 GURL("http://other.com"),

1081 CONTENT_SETTINGS_TYPE_COOKIES,	1081 CONTENT_SETTINGS_TYPE_COOKIES,

1082 std::string()));	1082 std::string()));

1083 EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,	1083 EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,

1084 host_content_settings_map->GetContentSetting(	1084 host_content_settings_map->GetContentSetting(

1085 GURL("http://third.com"),	1085 GURL("http://third.com"),

1086 GURL("http://third.com"),	1086 GURL("http://third.com"),

1087 CONTENT_SETTINGS_TYPE_COOKIES,	1087 CONTENT_SETTINGS_TYPE_COOKIES,

1088 std::string()));	1088 std::string()));

1089 }	1089 }

OLD	NEW