summaryrefslogtreecommitdiffstats
path: root/sync/internal_api
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 22:45:26 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 22:45:26 +0000
commitfa32b744b84ccf9da16527d09a7b9f58a385cd9b (patch)
treea5a101e1e5ea38ab779858766d19fdf4872853da /sync/internal_api
parent79f005f0376f73bd053545c045b3d2f9eafda11e (diff)
downloadchromium_src-fa32b744b84ccf9da16527d09a7b9f58a385cd9b.zip
chromium_src-fa32b744b84ccf9da16527d09a7b9f58a385cd9b.tar.gz
chromium_src-fa32b744b84ccf9da16527d09a7b9f58a385cd9b.tar.bz2
[Sync] Remove/refactor unnecessary command line switches
This consolidates all flags for disabling individual sync types into one, which we parse to decide which flags should be disabled. The parsing logic is added to model_type.cc (in the form of ModelTypeSetFromString). This patch also removes the obsolete history sync about:flag experiment. BUG=343274 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/195893014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api')
-rw-r--r--sync/internal_api/public/base/model_type.h5
-rw-r--r--sync/internal_api/sync_manager_impl.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index a29d6a0..831fd2c 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -279,8 +279,13 @@ SYNC_EXPORT_PRIVATE ModelType ModelTypeFromValue(const base::Value& value);
SYNC_EXPORT ModelType ModelTypeFromString(
const std::string& model_type_string);
+// Returns the comma-separated string representation of |model_types|.
SYNC_EXPORT std::string ModelTypeSetToString(ModelTypeSet model_types);
+// Returns the set of comma-separated model types from |model_type_string|.
+SYNC_EXPORT ModelTypeSet ModelTypeSetFromString(
+ const std::string& model_type_string);
+
// Caller takes ownership of returned list.
SYNC_EXPORT base::ListValue* ModelTypeSetToValue(ModelTypeSet model_types);
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 68c6e5c..501f887 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -65,8 +65,8 @@ static const int kSyncRefreshDelayMsec = 500;
static const int kSyncSchedulerDelayMsec = 250;
// Maximum count and size for traffic recorder.
-static const unsigned int kMaxMessagesToRecord = 10;
-static const unsigned int kMaxMessageSizeToRecord = 5 * 1024;
+static const unsigned int kMaxMessagesToRecord = 100;
+static const unsigned int kMaxMessageSizeToRecord = 50 * 1024;
GetUpdatesCallerInfo::GetUpdatesSource GetSourceFromReason(
ConfigureReason reason) {