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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/macros.h" | 9 #include "base/macros.h" |
8 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
9 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
10 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
11 #include "base/values.h" | 13 #include "base/values.h" |
12 #include "build/build_config.h" | 14 #include "build/build_config.h" |
13 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 15 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
14 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 17 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
16 #include "chrome/browser/sync/test/integration/passwords_helper.h" | 18 #include "chrome/browser/sync/test/integration/passwords_helper.h" |
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2201 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 2203 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
2202 ASSERT_TRUE(AllModelsMatchVerifier()); | 2204 ASSERT_TRUE(AllModelsMatchVerifier()); |
2203 ASSERT_EQ(1, bar_node0->child_count()); | 2205 ASSERT_EQ(1, bar_node0->child_count()); |
2204 ASSERT_EQ(1, bar_node1->child_count()); | 2206 ASSERT_EQ(1, bar_node1->child_count()); |
2205 | 2207 |
2206 // Set the ManagedBookmarks policy for the first Profile, | 2208 // Set the ManagedBookmarks policy for the first Profile, |
2207 // which will add one new managed bookmark. | 2209 // which will add one new managed bookmark. |
2208 base::DictionaryValue* bookmark = new base::DictionaryValue(); | 2210 base::DictionaryValue* bookmark = new base::DictionaryValue(); |
2209 bookmark->SetString("name", "Managed bookmark"); | 2211 bookmark->SetString("name", "Managed bookmark"); |
2210 bookmark->SetString("url", "youtube.com"); | 2212 bookmark->SetString("url", "youtube.com"); |
2211 base::ListValue* list = new base::ListValue(); | 2213 std::unique_ptr<base::ListValue> list(new base::ListValue()); |
2212 list->Append(bookmark); | 2214 list->Append(bookmark); |
2213 policy::PolicyMap policy; | 2215 policy::PolicyMap policy; |
2214 policy.Set(policy::key::kManagedBookmarks, | 2216 policy.Set(policy::key::kManagedBookmarks, policy::POLICY_LEVEL_MANDATORY, |
2215 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, | 2217 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, |
2216 policy::POLICY_SOURCE_CLOUD, list, nullptr); | 2218 std::move(list), nullptr); |
2217 policy_provider_.UpdateChromePolicy(policy); | 2219 policy_provider_.UpdateChromePolicy(policy); |
2218 base::RunLoop().RunUntilIdle(); | 2220 base::RunLoop().RunUntilIdle(); |
2219 | 2221 |
2220 // Now add another user bookmark and wait for it to sync. | 2222 // Now add another user bookmark and wait for it to sync. |
2221 ASSERT_TRUE(AddURL(0, "Google 2", google_url) != NULL); | 2223 ASSERT_TRUE(AddURL(0, "Google 2", google_url) != NULL); |
2222 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 2224 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
2223 ASSERT_TRUE(AllModelsMatchVerifier()); | 2225 ASSERT_TRUE(AllModelsMatchVerifier()); |
2224 | 2226 |
2225 EXPECT_FALSE(GetSyncService(0)->HasUnrecoverableError()); | 2227 EXPECT_FALSE(GetSyncService(0)->HasUnrecoverableError()); |
2226 EXPECT_FALSE(GetSyncService(1)->HasUnrecoverableError()); | 2228 EXPECT_FALSE(GetSyncService(1)->HasUnrecoverableError()); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2339 // second client. | 2341 // second client. |
2340 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS)); | 2342 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS)); |
2341 const std::string url_title_2 = "another happy little url"; | 2343 const std::string url_title_2 = "another happy little url"; |
2342 const GURL url_2("https://example.com/second"); | 2344 const GURL url_2("https://example.com/second"); |
2343 ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, url_title_2, url_2) != NULL); | 2345 ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, url_title_2, url_2) != NULL); |
2344 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::BOOKMARKS)); | 2346 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::BOOKMARKS)); |
2345 ASSERT_TRUE(AwaitAllModelsMatch()); | 2347 ASSERT_TRUE(AwaitAllModelsMatch()); |
2346 ASSERT_EQ(initial_count + 2, CountAllBookmarks(0)); | 2348 ASSERT_EQ(initial_count + 2, CountAllBookmarks(0)); |
2347 ASSERT_EQ(initial_count + 2, CountAllBookmarks(1)); | 2349 ASSERT_EQ(initial_count + 2, CountAllBookmarks(1)); |
2348 } | 2350 } |
OLD | NEW |