summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-18 12:45:39 +0000
committerghc@google.com <ghc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-18 12:45:39 +0000
commit5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef (patch)
tree647727ed83f3672e46fb983154f308f96a0b3bad /sync
parenta4365670b6bc6ae5dd9b47051f9aeca6e659e540 (diff)
downloadchromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.zip
chromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.tar.gz
chromium_src-5e5e2f2410ea73d2fe67e97d90f79d5a439f85ef.tar.bz2
Roll cacheinvalidation forward to @261.
Changes there are mostly refactorings, with some minor changes around when the client sends presence heartbeats after coming online. Review URL: https://chromiumcodereview.appspot.com/11993005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/notifier/push_client_channel_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/notifier/push_client_channel_unittest.cc b/sync/notifier/push_client_channel_unittest.cc
index 4ac0c58..ffe90e7 100644
--- a/sync/notifier/push_client_channel_unittest.cc
+++ b/sync/notifier/push_client_channel_unittest.cc
@@ -33,7 +33,7 @@ class PushClientChannelTest : public ::testing::Test {
virtual ~PushClientChannelTest() {}
- void OnIncomingMessage(const std::string& incoming_message) {
+ void OnIncomingMessage(std::string incoming_message) {
last_message_ = incoming_message;
}