chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 8477004: Have content/ create and destroy its own threads.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: With this patchset, Chrome runs and exits normally on Linux. Created 9 years, 1 month 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

« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/content_settings/cookie_settings_unittest.cc ('k') | chrome/browser/cookies_tree_model_unittest.cc » ('j') | content/public/browser/browser_main_parts.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/content_settings/content_settings_details.h"	10 #include "chrome/browser/content_settings/content_settings_details.h"

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

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

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

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

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

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

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

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

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

(...skipping 1062 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1081 CONTENT_SETTINGS_TYPE_IMAGES,	1082 CONTENT_SETTINGS_TYPE_IMAGES,

1082 std::string(),	1083 std::string(),

1083 CONTENT_SETTING_BLOCK);	1084 CONTENT_SETTING_BLOCK);

1084 EXPECT_EQ(CONTENT_SETTING_BLOCK,	1085 EXPECT_EQ(CONTENT_SETTING_BLOCK,

1085 host_content_settings_map->GetContentSetting(	1086 host_content_settings_map->GetContentSetting(

1086 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));	1087 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));

1087 EXPECT_EQ(CONTENT_SETTING_ALLOW,	1088 EXPECT_EQ(CONTENT_SETTING_ALLOW,

1088 host_content_settings_map->GetContentSetting(	1089 host_content_settings_map->GetContentSetting(

1089 embedder, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));	1090 embedder, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));

1090 }	1091 }

OLD	NEW