chrome/browser/managed_mode/managed_mode_browsertest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Side by Side Diff: chrome/browser/managed_mode/managed_mode_browsertest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. 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

« chrome/browser/geolocation/geolocation_prefs.h ('K') | « chrome/browser/managed_mode/managed_mode.h ('k') | chrome/browser/managed_mode/managed_user_service.h » ('j') | chrome/browser/prefs/incognito_mode_prefs.cc » ('J')
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/command_line.h"	5 #include "base/command_line.h"

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

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

8 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"	8 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"

9 #include "chrome/browser/infobars/infobar.h"	9 #include "chrome/browser/infobars/infobar.h"

10 #include "chrome/browser/infobars/infobar_tab_helper.h"	10 #include "chrome/browser/infobars/infobar_tab_helper.h"

11 #include "chrome/browser/managed_mode/managed_mode.h"	11 #include "chrome/browser/managed_mode/managed_mode.h"

12 #include "chrome/browser/managed_mode/managed_user_service.h"	12 #include "chrome/browser/managed_mode/managed_user_service.h"

13 #include "chrome/browser/managed_mode/managed_user_service_factory.h"	13 #include "chrome/browser/managed_mode/managed_user_service_factory.h"

14 #include "chrome/browser/prefs/pref_service_syncable.h"	14 #include "chrome/browser/prefs/pref_registry_syncable.h"

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

15 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/browser.h"	17 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_navigator.h"	18 #include "chrome/browser/ui/browser_navigator.h"

18 #include "chrome/browser/ui/tabs/tab_strip_model.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model.h"

19 #include "chrome/common/chrome_notification_types.h"	20 #include "chrome/common/chrome_notification_types.h"

20 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

22 #include "chrome/test/base/in_process_browser_test.h"	23 #include "chrome/test/base/in_process_browser_test.h"

23 #include "chrome/test/base/ui_test_utils.h"	24 #include "chrome/test/base/ui_test_utils.h"

24 #include "content/public/browser/interstitial_page.h"	25 #include "content/public/browser/interstitial_page.h"

(...skipping 478 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
503	504

504 CheckShownPageIsInterstitial(tab);	505 CheckShownPageIsInterstitial(tab);

505 CheckNumberOfInfobars(0);	506 CheckNumberOfInfobars(0);

506	507

507 ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);	508 ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);

508	509

509 EXPECT_FALSE(managed_user_service_->IsInManualList(true, "www.example.com"));	510 EXPECT_FALSE(managed_user_service_->IsInManualList(true, "www.example.com"));

510 EXPECT_TRUE(managed_user_service_->IsInManualList(true,	511 EXPECT_TRUE(managed_user_service_->IsInManualList(true,

511 "www.new-example.com"));	512 "www.new-example.com"));

512 }	513 }

OLD	NEW