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

Side by Side Diff: chrome/browser/sync/test/integration/two_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, 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
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 <stddef.h>
6
5 #include "base/guid.h" 7 #include "base/guid.h"
6 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "base/macros.h"
7 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h"
9 #include "chrome/browser/sessions/session_service.h" 13 #include "chrome/browser/sessions/session_service.h"
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 14 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 15 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
13 #include "chrome/browser/sync/test/integration/sync_test.h" 17 #include "chrome/browser/sync/test/integration/sync_test.h"
14 #include "chrome/browser/sync/test/integration/typed_urls_helper.h" 18 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
15 #include "components/history/core/browser/history_types.h" 19 #include "components/history/core/browser/history_types.h"
16 20
17 using base::ASCIIToUTF16; 21 using base::ASCIIToUTF16;
18 using bookmarks::BookmarkNode; 22 using bookmarks::BookmarkNode;
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 // - this should not cause a crash. 535 // - this should not cause a crash.
532 AddUrlToHistory(0, bookmark_url); 536 AddUrlToHistory(0, bookmark_url);
533 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 537 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
534 538
535 ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs()); 539 ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
536 history::URLRows urls = GetTypedUrlsFromClient(0); 540 history::URLRows urls = GetTypedUrlsFromClient(0);
537 ASSERT_EQ(1U, urls.size()); 541 ASSERT_EQ(1U, urls.size());
538 ASSERT_EQ(bookmark_url, urls[0].url()); 542 ASSERT_EQ(bookmark_url, urls[0].url());
539 ASSERT_EQ(1, GetVisitCountForFirstURL(0)); 543 ASSERT_EQ(1, GetVisitCountForFirstURL(0));
540 } 544 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698