Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Side by Side Diff: chrome/browser/sync/test/integration/single_client_typed_urls_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, 12 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
OLDNEW
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/macros.h"
5 #include "chrome/browser/sessions/session_service.h" 6 #include "chrome/browser/sessions/session_service.h"
6 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 7 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
7 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
8 #include "chrome/browser/sync/test/integration/typed_urls_helper.h" 9 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
9 #include "components/browser_sync/browser/profile_sync_service.h" 10 #include "components/browser_sync/browser/profile_sync_service.h"
10 #include "components/history/core/browser/history_types.h" 11 #include "components/history/core/browser/history_types.h"
11 12
12 using sync_integration_test_util::AwaitCommitActivityCompletion; 13 using sync_integration_test_util::AwaitCommitActivityCompletion;
13 using typed_urls_helper::AddUrlToHistory; 14 using typed_urls_helper::AddUrlToHistory;
14 using typed_urls_helper::AddUrlToHistoryWithTransition; 15 using typed_urls_helper::AddUrlToHistoryWithTransition;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 111 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
111 ASSERT_TRUE(CheckAllProfilesHaveSameURLs()); 112 ASSERT_TRUE(CheckAllProfilesHaveSameURLs());
112 113
113 // Now delete the URL we just added, wait for sync and verify the deletion. 114 // Now delete the URL we just added, wait for sync and verify the deletion.
114 DeleteUrlFromHistory(0, new_url); 115 DeleteUrlFromHistory(0, new_url);
115 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 116 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
116 urls = GetTypedUrlsFromClient(0); 117 urls = GetTypedUrlsFromClient(0);
117 ASSERT_EQ(0U, urls.size()); 118 ASSERT_EQ(0U, urls.size());
118 ASSERT_TRUE(CheckAllProfilesHaveSameURLs()); 119 ASSERT_TRUE(CheckAllProfilesHaveSameURLs());
119 } 120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698