chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

Side by Side Diff: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 11 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

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc » ('j') | no next file with comments »
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 <stddef.h>

	6

	7 #include "base/macros.h"

5 #include "base/rand_util.h"	8 #include "base/rand_util.h"

6 #include "base/run_loop.h"	9 #include "base/run_loop.h"

7 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

8 #include "base/values.h"	11 #include "base/values.h"

	12 #include "build/build_config.h"

9 #include "chrome/browser/policy/profile_policy_connector_factory.h"	13 #include "chrome/browser/policy/profile_policy_connector_factory.h"

10 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"	15 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"

12 #include "chrome/browser/sync/test/integration/passwords_helper.h"	16 #include "chrome/browser/sync/test/integration/passwords_helper.h"

13 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	17 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

14 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"	18 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

15 #include "chrome/browser/sync/test/integration/sync_test.h"	19 #include "chrome/browser/sync/test/integration/sync_test.h"

16 #include "components/bookmarks/browser/bookmark_node.h"	20 #include "components/bookmarks/browser/bookmark_node.h"

17 #include "components/policy/core/common/mock_configuration_policy_provider.h"	21 #include "components/policy/core/common/mock_configuration_policy_provider.h"

18 #include "components/policy/core/common/policy_map.h"	22 #include "components/policy/core/common/policy_map.h"

(...skipping 2316 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2335 // second client.	2339 // second client.

2336 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS));	2340 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS));

2337 const std::string url_title_2 = "another happy little url";	2341 const std::string url_title_2 = "another happy little url";

2338 const GURL url_2("https://example.com/second");	2342 const GURL url_2("https://example.com/second");

2339 ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, url_title_2, url_2) != NULL);	2343 ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, url_title_2, url_2) != NULL);

2340 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::BOOKMARKS));	2344 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::BOOKMARKS));

2341 ASSERT_TRUE(AwaitAllModelsMatch());	2345 ASSERT_TRUE(AwaitAllModelsMatch());

2342 ASSERT_EQ(initial_count + 2, CountAllBookmarks(0));	2346 ASSERT_EQ(initial_count + 2, CountAllBookmarks(0));

2343 ASSERT_EQ(initial_count + 2, CountAllBookmarks(1));	2347 ASSERT_EQ(initial_count + 2, CountAllBookmarks(1));

2344 }	2348 }

OLD	NEW