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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 "chrome/browser/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 42 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
43 #include "chrome/browser/ui/browser.h" 43 #include "chrome/browser/ui/browser.h"
44 #include "chrome/browser/ui/browser_finder.h" 44 #include "chrome/browser/ui/browser_finder.h"
45 #include "chrome/browser/ui/host_desktop.h" 45 #include "chrome/browser/ui/host_desktop.h"
46 #include "chrome/browser/ui/tabs/tab_strip_model.h" 46 #include "chrome/browser/ui/tabs/tab_strip_model.h"
47 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 47 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
48 #include "chrome/common/chrome_paths.h" 48 #include "chrome/common/chrome_paths.h"
49 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
50 #include "chrome/test/base/testing_browser_process.h" 50 #include "chrome/test/base/testing_browser_process.h"
51 #include "chrome/test/base/ui_test_utils.h" 51 #include "chrome/test/base/ui_test_utils.h"
52 #include "components/bookmarks/core/test/bookmark_test_helpers.h" 52 #include "components/bookmarks/test/bookmark_test_helpers.h"
53 #include "components/invalidation/invalidation_switches.h" 53 #include "components/invalidation/invalidation_switches.h"
54 #include "components/invalidation/p2p_invalidation_service.h" 54 #include "components/invalidation/p2p_invalidation_service.h"
55 #include "components/os_crypt/os_crypt.h" 55 #include "components/os_crypt/os_crypt.h"
56 #include "components/signin/core/browser/signin_manager.h" 56 #include "components/signin/core/browser/signin_manager.h"
57 #include "content/public/browser/web_contents.h" 57 #include "content/public/browser/web_contents.h"
58 #include "content/public/test/test_browser_thread.h" 58 #include "content/public/test/test_browser_thread.h"
59 #include "google_apis/gaia/gaia_urls.h" 59 #include "google_apis/gaia/gaia_urls.h"
60 #include "net/base/escape.h" 60 #include "net/base/escape.h"
61 #include "net/base/load_flags.h" 61 #include "net/base/load_flags.h"
62 #include "net/base/network_change_notifier.h" 62 #include "net/base/network_change_notifier.h"
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 BrowserThread::PostTask( 1044 BrowserThread::PostTask(
1045 BrowserThread::IO, FROM_HERE, 1045 BrowserThread::IO, FROM_HERE,
1046 base::Bind(&SetProxyConfigCallback, &done, 1046 base::Bind(&SetProxyConfigCallback, &done,
1047 make_scoped_refptr(context_getter), proxy_config)); 1047 make_scoped_refptr(context_getter), proxy_config));
1048 done.Wait(); 1048 done.Wait();
1049 } 1049 }
1050 1050
1051 fake_server::FakeServer* SyncTest::GetFakeServer() const { 1051 fake_server::FakeServer* SyncTest::GetFakeServer() const {
1052 return fake_server_.get(); 1052 return fake_server_.get();
1053 } 1053 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698