chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs.

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/content_settings_pref_provider_unittest.cc

Issue 12789006: base/prefs: Remove the public/ directory and move the files to //base/prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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

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 "chrome/browser/content_settings/content_settings_pref_provider.h"	5 #include "chrome/browser/content_settings/content_settings_pref_provider.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

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

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

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

11 #include "base/prefs/default_pref_store.h"	11 #include "base/prefs/default_pref_store.h"

12 #include "base/prefs/overlay_user_pref_store.h"	12 #include "base/prefs/overlay_user_pref_store.h"

	13 #include "base/prefs/pref_change_registrar.h"

13 #include "base/prefs/pref_service.h"	14 #include "base/prefs/pref_service.h"

14 #include "base/prefs/public/pref_change_registrar.h"

15 #include "base/prefs/testing_pref_store.h"	15 #include "base/prefs/testing_pref_store.h"

16 #include "base/threading/platform_thread.h"	16 #include "base/threading/platform_thread.h"

17 #include "base/values.h"	17 #include "base/values.h"

18 #include "chrome/browser/content_settings/content_settings_mock_observer.h"	18 #include "chrome/browser/content_settings/content_settings_mock_observer.h"

19 #include "chrome/browser/content_settings/content_settings_utils.h"	19 #include "chrome/browser/content_settings/content_settings_utils.h"

20 #include "chrome/browser/prefs/browser_prefs.h"	20 #include "chrome/browser/prefs/browser_prefs.h"

21 #include "chrome/browser/prefs/pref_service_mock_builder.h"	21 #include "chrome/browser/prefs/pref_service_mock_builder.h"

22 #include "chrome/browser/prefs/pref_service_syncable.h"	22 #include "chrome/browser/prefs/pref_service_syncable.h"

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

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

(...skipping 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
389 DictionaryValue* mutable_settings = update.Get();	389 DictionaryValue* mutable_settings = update.Get();

390 mutable_settings->SetWithoutPathExpansion("www.example.com,*",	390 mutable_settings->SetWithoutPathExpansion("www.example.com,*",

391 new base::DictionaryValue());	391 new base::DictionaryValue());

392 }	392 }

393 EXPECT_TRUE(observer.notification_received());	393 EXPECT_TRUE(observer.notification_received());

394	394

395 provider.ShutdownOnUIThread();	395 provider.ShutdownOnUIThread();

396 }	396 }

397	397

398 } // namespace content_settings	398 } // namespace content_settings

OLD	NEW