chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 years, 4 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/threading/platform_thread.h"	11 #include "base/threading/platform_thread.h"

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

	13 #include "chrome/browser/api/prefs/pref_change_registrar.h"

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

14 #include "chrome/browser/content_settings/content_settings_utils.h"	15 #include "chrome/browser/content_settings/content_settings_utils.h"

15 #include "chrome/browser/prefs/browser_prefs.h"	16 #include "chrome/browser/prefs/browser_prefs.h"

16 #include "chrome/browser/prefs/default_pref_store.h"	17 #include "chrome/browser/prefs/default_pref_store.h"

17 #include "chrome/browser/prefs/overlay_user_pref_store.h"	18 #include "chrome/browser/prefs/overlay_user_pref_store.h"

18 #include "chrome/browser/prefs/pref_change_registrar.h"

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

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

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

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

23 #include "chrome/common/chrome_notification_types.h"	23 #include "chrome/common/chrome_notification_types.h"

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

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

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

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

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

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

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

592 new base::DictionaryValue());	592 new base::DictionaryValue());

593 }	593 }

594 EXPECT_TRUE(observer.notification_received());	594 EXPECT_TRUE(observer.notification_received());

595	595

596 provider.ShutdownOnUIThread();	596 provider.ShutdownOnUIThread();

597 }	597 }

598	598

599 } // namespace content_settings	599 } // namespace content_settings

OLD	NEW