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

Unified Diff: jingle/notifier/base/fake_base_task.cc

Issue 9234053: Revert 119171 - Maybe introduced a static initializer - or may be 119173 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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: jingle/notifier/base/fake_base_task.cc
===================================================================
--- jingle/notifier/base/fake_base_task.cc (revision 119174)
+++ jingle/notifier/base/fake_base_task.cc (working copy)
@@ -1,11 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/compiler_specific.h"
#include "jingle/notifier/base/fake_base_task.h"
#include "jingle/notifier/base/weak_xmpp_client.h"
-#include "talk/xmpp/jid.h"
#include "talk/xmpp/asyncsocket.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -28,32 +26,10 @@
MOCK_METHOD1(StartTls, bool(const std::string&));
};
-} // namespace notifier
-
-// Extends WeakXmppClient to make jid() return a full jid, as required by
-// PushNotificationsSubscribeTask.
-class FakeWeakXmppClient : public notifier::WeakXmppClient {
- public:
- explicit FakeWeakXmppClient(talk_base::TaskParent* parent)
- : notifier::WeakXmppClient(parent),
- jid_("test@example.com/testresource") {}
-
- virtual ~FakeWeakXmppClient() {}
-
- virtual const buzz::Jid& jid() const OVERRIDE {
- return jid_;
- }
-
- private:
- buzz::Jid jid_;
-};
-
-namespace notifier {
-
FakeBaseTask::FakeBaseTask() {
// Owned by |task_pump_|.
- FakeWeakXmppClient* weak_xmpp_client =
- new FakeWeakXmppClient(&task_pump_);
+ notifier::WeakXmppClient* weak_xmpp_client =
+ new notifier::WeakXmppClient(&task_pump_);
weak_xmpp_client->Start();
buzz::XmppClientSettings settings;
Property changes on: jingle/notifier/base/fake_base_task.cc
___________________________________________________________________
Deleted: svn:eol-style
- LF
« no previous file with comments | « chrome/browser/sync/notifier/chrome_system_resources.cc ('k') | jingle/notifier/listener/notification_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698