diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 20:33:58 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 20:33:58 +0000 |
| commit | 43aae0235d52b977a6f21b7d7fff57773e0bd862 (patch) | |
| tree | 9c84e22a8bb7f1e953ba44b3614f72f028666ab1 /net/tools/testserver | |
| parent | 5e6887f20e23dbd3335ef3c1251fa50d7ace956b (diff) | |
| download | chromium_src-43aae0235d52b977a6f21b7d7fff57773e0bd862.zip chromium_src-43aae0235d52b977a6f21b7d7fff57773e0bd862.tar.gz chromium_src-43aae0235d52b977a6f21b7d7fff57773e0bd862.tar.bz2 | |
Upstream setting flag for outgoing favicon sync.
Android does not support experiments or about:flags, so we need to
set the command line flag directly to enable outgoing favicon sync.
Also, this repurposes the old sync_tabs experiments to the new
sync_favicon_tabs experiment in the sync test server.
BUG=141688
Review URL: https://chromiumcodereview.appspot.com/10908082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/testserver')
| -rw-r--r-- | net/tools/testserver/chromiumsync.py | 14 | ||||
| -rwxr-xr-x | net/tools/testserver/testserver.py | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index 24325f5..4bc2d85 100644 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -932,8 +932,8 @@ class SyncDataModel(object): entry.parent_id_string) self._entries[entry.id_string] = entry - def TriggerSyncTabs(self): - """Set the 'sync_tabs' field to this account's nigori node. + def TriggerSyncTabFavicons(self): + """Set the 'sync_tab_favicons' field to this account's nigori node. If the field is not currently set, will write a new nigori node entry with the field set. Else does nothing. @@ -941,7 +941,7 @@ class SyncDataModel(object): nigori_tag = "google_chrome_nigori" nigori_original = self._entries.get(self._ServerTagToId(nigori_tag)) - if (nigori_original.specifics.nigori.sync_tabs): + if (nigori_original.specifics.nigori.sync_tab_favicons): return nigori_new = copy.deepcopy(nigori_original) nigori_new.specifics.nigori.sync_tabs = True @@ -1101,12 +1101,12 @@ class TestServer(object): 200, '<html><title>Transient error</title><H1>Transient error</H1></html>') - def HandleSetSyncTabs(self): - """Set the 'sync_tab' field of the nigori node for this account.""" - self.account.TriggerSyncTabs() + def HandleSetSyncTabFavicons(self): + """Set 'sync_tab_favicons' field of the nigori node for this account.""" + self.account.TriggerSyncTabFavicons() return ( 200, - '<html><title>Sync Tabs</title><H1>Sync Tabs</H1></html>') + '<html><title>Tab Favicons</title><H1>Tab Favicons</H1></html>') def HandleCreateSyncedBookmarks(self): """Create the Synced Bookmarks folder under Bookmarks.""" diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 84ee77e..1a7aea4 100755 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -1727,7 +1727,7 @@ class SyncPageHandler(BasePageHandler): self.ChromiumSyncBirthdayErrorOpHandler, self.ChromiumSyncTransientErrorOpHandler, self.ChromiumSyncErrorOpHandler, - self.ChromiumSyncSyncTabsOpHandler, + self.ChromiumSyncSyncTabFaviconsOpHandler, self.ChromiumSyncCreateSyncedBookmarksOpHandler] post_handlers = [self.ChromiumSyncCommandHandler, @@ -1916,11 +1916,11 @@ class SyncPageHandler(BasePageHandler): self.wfile.write(raw_reply) return True; - def ChromiumSyncSyncTabsOpHandler(self): - test_name = "/chromiumsync/synctabs" + def ChromiumSyncSyncTabFaviconsOpHandler(self): + test_name = "/chromiumsync/synctabfavicons" if not self._ShouldHandleRequest(test_name): return False - result, raw_reply = self.server._sync_handler.HandleSetSyncTabs() + result, raw_reply = self.server._sync_handler.HandleSetSyncTabFavicons() self.send_response(result) self.send_header('Content-Type', 'text/html') self.send_header('Content-Length', len(raw_reply)) |