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

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <limits> 10 #include <limits>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "net/base/port_util.h" 87 #include "net/base/port_util.h"
88 #include "net/url_request/test_url_fetcher_factory.h" 88 #include "net/url_request/test_url_fetcher_factory.h"
89 #include "net/url_request/url_fetcher.h" 89 #include "net/url_request/url_fetcher.h"
90 #include "net/url_request/url_fetcher_delegate.h" 90 #include "net/url_request/url_fetcher_delegate.h"
91 #include "url/gurl.h" 91 #include "url/gurl.h"
92 92
93 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
94 #include "chromeos/chromeos_switches.h" 94 #include "chromeos/chromeos_switches.h"
95 #endif 95 #endif
96 96
97 using browser_sync::ProfileSyncService;
97 using content::BrowserThread; 98 using content::BrowserThread;
98 99
99 namespace switches { 100 namespace switches {
100 const char kPasswordFileForTest[] = "password-file-for-test"; 101 const char kPasswordFileForTest[] = "password-file-for-test";
101 const char kSyncUserForTest[] = "sync-user-for-test"; 102 const char kSyncUserForTest[] = "sync-user-for-test";
102 const char kSyncPasswordForTest[] = "sync-password-for-test"; 103 const char kSyncPasswordForTest[] = "sync-password-for-test";
103 const char kSyncServerCommandLine[] = "sync-server-command-line"; 104 const char kSyncServerCommandLine[] = "sync-server-command-line";
104 } 105 }
105 106
106 namespace { 107 namespace {
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 1132
1132 void SyncTest::TriggerSyncForModelTypes(int index, 1133 void SyncTest::TriggerSyncForModelTypes(int index,
1133 syncer::ModelTypeSet model_types) { 1134 syncer::ModelTypeSet model_types) {
1134 GetSyncService(index)->TriggerRefresh(model_types); 1135 GetSyncService(index)->TriggerRefresh(model_types);
1135 } 1136 }
1136 1137
1137 void SyncTest::SetPreexistingPreferencesFileContents( 1138 void SyncTest::SetPreexistingPreferencesFileContents(
1138 const std::string& contents) { 1139 const std::string& contents) {
1139 preexisting_preferences_file_contents_ = contents; 1140 preexisting_preferences_file_contents_ = contents;
1140 } 1141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698