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

Unified Diff: sync/internal_api/sync_rollback_manager_base_unittest.cc

Issue 442403003: Update SyncManager::Init to use a GURL for the sync server URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_client.cc too. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/sync_rollback_manager_base_unittest.cc
diff --git a/sync/internal_api/sync_rollback_manager_base_unittest.cc b/sync/internal_api/sync_rollback_manager_base_unittest.cc
index 1d4c2dec029ce0a42f0400f10127f26a31cbf296..74ffadc612b4f0116b0366ca280ed0ef73da1b00 100644
--- a/sync/internal_api/sync_rollback_manager_base_unittest.cc
+++ b/sync/internal_api/sync_rollback_manager_base_unittest.cc
@@ -9,6 +9,7 @@
#include "sync/internal_api/public/read_transaction.h"
#include "sync/internal_api/public/test/test_internal_components_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace syncer {
@@ -23,9 +24,7 @@ class SyncTestRollbackManager : public SyncRollbackManagerBase {
virtual void Init(
const base::FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
- const std::string& sync_server_and_path,
- int sync_server_port,
- bool use_ssl,
+ const GURL& service_url,
scoped_ptr<HttpPostProviderFactory> post_factory,
const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
ExtensionsActivity* extensions_activity,
@@ -53,11 +52,20 @@ class SyncRollbackManagerBaseTest : public testing::Test {
STORAGE_IN_MEMORY);
manager_.Init(base::FilePath(base::FilePath::kCurrentDirectory),
MakeWeakHandle(base::WeakPtr<JsEventHandler>()),
- "", 0, true, scoped_ptr<HttpPostProviderFactory>().Pass(),
+ GURL("https://example.com/"),
+ scoped_ptr<HttpPostProviderFactory>().Pass(),
std::vector<scoped_refptr<ModelSafeWorker> >(),
- NULL, NULL, SyncCredentials(), "", "", "", &factory,
- NULL, scoped_ptr<UnrecoverableErrorHandler>().Pass(),
- NULL, NULL);
+ NULL,
+ NULL,
+ SyncCredentials(),
+ "",
+ "",
+ "",
+ &factory,
+ NULL,
+ scoped_ptr<UnrecoverableErrorHandler>().Pass(),
+ NULL,
+ NULL);
}
SyncTestRollbackManager manager_;

Powered by Google App Engine
This is Rietveld 408576698