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

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

Issue 12902030: Make Encryptor a component. Used by //chrome and (soon) //components/webdata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove duplicate include. Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/glue/chrome_encryptor_unittest.cc ('k') | chrome/browser/webdata/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
17 #include "base/test/test_timeouts.h" 17 #include "base/test/test_timeouts.h"
18 #include "base/threading/platform_thread.h" 18 #include "base/threading/platform_thread.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "base/values.h" 20 #include "base/values.h"
21 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 21 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
22 #include "chrome/browser/google/google_url_tracker.h" 22 #include "chrome/browser/google/google_url_tracker.h"
23 #include "chrome/browser/history/history_service_factory.h" 23 #include "chrome/browser/history/history_service_factory.h"
24 #include "chrome/browser/lifetime/application_lifetime.h" 24 #include "chrome/browser/lifetime/application_lifetime.h"
25 #include "chrome/browser/password_manager/encryptor.h"
26 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/profiles/profile_manager.h" 26 #include "chrome/browser/profiles/profile_manager.h"
28 #include "chrome/browser/search_engines/template_url_service.h" 27 #include "chrome/browser/search_engines/template_url_service.h"
29 #include "chrome/browser/search_engines/template_url_service_factory.h" 28 #include "chrome/browser/search_engines/template_url_service_factory.h"
30 #include "chrome/browser/sync/profile_sync_service_factory.h" 29 #include "chrome/browser/sync/profile_sync_service_factory.h"
31 #include "chrome/browser/sync/profile_sync_service_harness.h" 30 #include "chrome/browser/sync/profile_sync_service_harness.h"
32 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 31 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
33 #include "chrome/browser/ui/browser.h" 32 #include "chrome/browser/ui/browser.h"
34 #include "chrome/browser/ui/browser_finder.h" 33 #include "chrome/browser/ui/browser_finder.h"
35 #include "chrome/browser/ui/host_desktop.h" 34 #include "chrome/browser/ui/host_desktop.h"
36 #include "chrome/browser/ui/tabs/tab_strip_model.h" 35 #include "chrome/browser/ui/tabs/tab_strip_model.h"
37 #include "chrome/common/chrome_paths.h" 36 #include "chrome/common/chrome_paths.h"
38 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
39 #include "chrome/test/base/testing_browser_process.h" 38 #include "chrome/test/base/testing_browser_process.h"
40 #include "chrome/test/base/ui_test_utils.h" 39 #include "chrome/test/base/ui_test_utils.h"
40 #include "components/webdata/encryptor/encryptor.h"
41 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
42 #include "content/public/test/test_browser_thread.h" 42 #include "content/public/test/test_browser_thread.h"
43 #include "google_apis/gaia/gaia_urls.h" 43 #include "google_apis/gaia/gaia_urls.h"
44 #include "googleurl/src/gurl.h" 44 #include "googleurl/src/gurl.h"
45 #include "net/base/escape.h" 45 #include "net/base/escape.h"
46 #include "net/base/load_flags.h" 46 #include "net/base/load_flags.h"
47 #include "net/base/network_change_notifier.h" 47 #include "net/base/network_change_notifier.h"
48 #include "net/proxy/proxy_config.h" 48 #include "net/proxy/proxy_config.h"
49 #include "net/proxy/proxy_config_service_fixed.h" 49 #include "net/proxy/proxy_config_service_fixed.h"
50 #include "net/proxy/proxy_service.h" 50 #include "net/proxy/proxy_service.h"
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 841
842 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, 842 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
843 const net::ProxyConfig& proxy_config) { 843 const net::ProxyConfig& proxy_config) {
844 base::WaitableEvent done(false, false); 844 base::WaitableEvent done(false, false);
845 BrowserThread::PostTask( 845 BrowserThread::PostTask(
846 BrowserThread::IO, FROM_HERE, 846 BrowserThread::IO, FROM_HERE,
847 base::Bind(&SetProxyConfigCallback, &done, 847 base::Bind(&SetProxyConfigCallback, &done,
848 make_scoped_refptr(context_getter), proxy_config)); 848 make_scoped_refptr(context_getter), proxy_config));
849 done.Wait(); 849 done.Wait();
850 } 850 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/chrome_encryptor_unittest.cc ('k') | chrome/browser/webdata/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698