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

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

Issue 200713005: components: Rename encryptor directory to os_crypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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 23 matching lines...) Expand all
34 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 34 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
35 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 35 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
36 #include "chrome/browser/ui/browser.h" 36 #include "chrome/browser/ui/browser.h"
37 #include "chrome/browser/ui/browser_finder.h" 37 #include "chrome/browser/ui/browser_finder.h"
38 #include "chrome/browser/ui/host_desktop.h" 38 #include "chrome/browser/ui/host_desktop.h"
39 #include "chrome/browser/ui/tabs/tab_strip_model.h" 39 #include "chrome/browser/ui/tabs/tab_strip_model.h"
40 #include "chrome/common/chrome_paths.h" 40 #include "chrome/common/chrome_paths.h"
41 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
42 #include "chrome/test/base/testing_browser_process.h" 42 #include "chrome/test/base/testing_browser_process.h"
43 #include "chrome/test/base/ui_test_utils.h" 43 #include "chrome/test/base/ui_test_utils.h"
44 #include "components/encryptor/os_crypt.h" 44 #include "components/os_crypt/os_crypt.h"
45 #include "content/public/browser/web_contents.h" 45 #include "content/public/browser/web_contents.h"
46 #include "content/public/test/test_browser_thread.h" 46 #include "content/public/test/test_browser_thread.h"
47 #include "google_apis/gaia/gaia_urls.h" 47 #include "google_apis/gaia/gaia_urls.h"
48 #include "net/base/escape.h" 48 #include "net/base/escape.h"
49 #include "net/base/load_flags.h" 49 #include "net/base/load_flags.h"
50 #include "net/base/network_change_notifier.h" 50 #include "net/base/network_change_notifier.h"
51 #include "net/proxy/proxy_config.h" 51 #include "net/proxy/proxy_config.h"
52 #include "net/proxy/proxy_config_service_fixed.h" 52 #include "net/proxy/proxy_config_service_fixed.h"
53 #include "net/proxy/proxy_service.h" 53 #include "net/proxy/proxy_service.h"
54 #include "net/test/spawned_test_server/spawned_test_server.h" 54 #include "net/test/spawned_test_server/spawned_test_server.h"
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 BrowserThread::IO, FROM_HERE, 878 BrowserThread::IO, FROM_HERE,
879 base::Bind(&SetProxyConfigCallback, &done, 879 base::Bind(&SetProxyConfigCallback, &done,
880 make_scoped_refptr(context_getter), proxy_config)); 880 make_scoped_refptr(context_getter), proxy_config));
881 done.Wait(); 881 done.Wait();
882 } 882 }
883 883
884 void SyncTest::UseFakeServer() { 884 void SyncTest::UseFakeServer() {
885 DCHECK_EQ(SERVER_TYPE_UNDECIDED, server_type_); 885 DCHECK_EQ(SERVER_TYPE_UNDECIDED, server_type_);
886 server_type_ = IN_PROCESS_FAKE_SERVER; 886 server_type_ = IN_PROCESS_FAKE_SERVER;
887 } 887 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc ('k') | chrome/browser/webdata/logins_table_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698