chrome/browser/policy/cloud_policy_browsertest.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

Side by Side Diff: chrome/browser/policy/cloud_policy_browsertest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/policy/browser_policy_connector.cc ('k') | chrome/browser/policy/cloud_policy_core_unittest.cc » ('j') | no next file with comments »

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

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

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

8 #include "base/files/scoped_temp_dir.h"	8 #include "base/files/scoped_temp_dir.h"

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

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

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

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

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/policy/browser_policy_connector.h"	14 #include "chrome/browser/policy/browser_policy_connector.h"

15 #include "chrome/browser/policy/cloud_policy_client.h"	15 #include "chrome/browser/policy/cloud_policy_client.h"

16 #include "chrome/browser/policy/cloud_policy_constants.h"	16 #include "chrome/browser/policy/cloud_policy_constants.h"

17 #include "chrome/browser/policy/cloud_policy_data_store.h"	17 #include "chrome/browser/policy/cloud_policy_data_store.h"

18 #include "chrome/browser/policy/policy_map.h"	18 #include "chrome/browser/policy/policy_map.h"

19 #include "chrome/browser/policy/policy_service.h"	19 #include "chrome/browser/policy/policy_service.h"

20 #include "chrome/browser/policy/proto/chrome_settings.pb.h"	20 #include "chrome/browser/policy/proto/chrome_settings.pb.h"

21 #include "chrome/browser/policy/proto/cloud_policy.pb.h"	21 #include "chrome/browser/policy/proto/cloud_policy.pb.h"

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

22 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/ui/browser.h"	24 #include "chrome/browser/ui/browser.h"

24 #include "chrome/common/chrome_notification_types.h"	25 #include "chrome/common/chrome_notification_types.h"

25 #include "chrome/common/chrome_switches.h"	26 #include "chrome/common/chrome_switches.h"

26 #include "chrome/test/base/in_process_browser_test.h"	27 #include "chrome/test/base/in_process_browser_test.h"

27 #include "content/public/browser/browser_thread.h"	28 #include "content/public/browser/browser_thread.h"

28 #include "content/public/browser/notification_service.h"	29 #include "content/public/browser/notification_service.h"

29 #include "content/public/browser/notification_source.h"	30 #include "content/public/browser/notification_source.h"

30 #include "content/public/test/test_utils.h"	31 #include "content/public/test/test_utils.h"

31 #include "googleurl/src/gurl.h"	32 #include "googleurl/src/gurl.h"

(...skipping 304 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
336	337

337 // They should now serialize to the same bytes.	338 // They should now serialize to the same bytes.

338 std::string chrome_settings_serialized;	339 std::string chrome_settings_serialized;

339 std::string cloud_policy_serialized;	340 std::string cloud_policy_serialized;

340 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));	341 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));

341 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));	342 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));

342 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);	343 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);

343 }	344 }

344	345

345 } // namespace policy	346 } // namespace policy

OLD	NEW