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

Side by Side Diff: chrome/browser/browsing_data/history_counter_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "chrome/browser/browsing_data/history_counter.h" 5 #include "chrome/browser/browsing_data/history_counter.h"
6 6
7 #include "base/prefs/pref_service.h"
8 #include "base/run_loop.h" 7 #include "base/run_loop.h"
9 #include "chrome/browser/history/history_service_factory.h" 8 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/history/web_history_service_factory.h" 9 #include "chrome/browser/history/web_history_service_factory.h"
11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
12 #include "chrome/browser/signin/signin_manager_factory.h" 11 #include "chrome/browser/signin/signin_manager_factory.h"
13 #include "chrome/browser/sync/test/integration/sync_test.h" 12 #include "chrome/browser/sync/test/integration/sync_test.h"
14 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
16 #include "components/browser_sync/browser/profile_sync_service.h" 15 #include "components/browser_sync/browser/profile_sync_service.h"
17 #include "components/history/core/browser/history_service.h" 16 #include "components/history/core/browser/history_service.h"
18 #include "components/history/core/browser/web_history_service.h" 17 #include "components/history/core/browser/web_history_service.h"
19 #include "components/history/core/test/fake_web_history_service.h" 18 #include "components/history/core/test/fake_web_history_service.h"
19 #include "components/prefs/pref_service.h"
20 #include "components/signin/core/browser/profile_oauth2_token_service.h" 20 #include "components/signin/core/browser/profile_oauth2_token_service.h"
21 #include "components/signin/core/browser/signin_manager.h" 21 #include "components/signin/core/browser/signin_manager.h"
22 #include "net/http/http_status_code.h" 22 #include "net/http/http_status_code.h"
23 #include "url/gurl.h" 23 #include "url/gurl.h"
24 24
25 namespace { 25 namespace {
26 26
27 class HistoryCounterTest : public SyncTest { 27 class HistoryCounterTest : public SyncTest {
28 public: 28 public:
29 HistoryCounterTest() : SyncTest(SINGLE_CLIENT) { 29 HistoryCounterTest() : SyncTest(SINGLE_CLIENT) {
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 // history deletion did not change. However, in reality we can get two 388 // history deletion did not change. However, in reality we can get two
389 // notifications, one that history sync has stopped and another that it is 389 // notifications, one that history sync has stopped and another that it is
390 // active again. 390 // active again.
391 391
392 // Stopping the Sync service triggers a restart. 392 // Stopping the Sync service triggers a restart.
393 sync_service->RequestStop(sync_driver::SyncService::CLEAR_DATA); 393 sync_service->RequestStop(sync_driver::SyncService::CLEAR_DATA);
394 WaitForCountingOrConfirmFinished(); 394 WaitForCountingOrConfirmFinished();
395 } 395 }
396 396
397 } // namespace 397 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698