Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / jingle / notifier / communicator / single_login_attempt_unittest.cc

diff --git a/src/jingle/notifier/communicator/single_login_attempt_unittest.cc b/src/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 237e9f1..d5b7418 100644 (file)
--- a/src/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/src/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -14,10 +14,10 @@
 #include "jingle/notifier/communicator/login_settings.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/url_request/url_request_test_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppengine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
@@ -35,24 +35,20 @@ class FakeDelegate : public SingleLoginAttempt::Delegate {
  public:
   FakeDelegate() : state_(IDLE) {}
 
-  virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE {
+  void OnConnect(
+      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) override {
     state_ = CONNECTED;
     base_task_ = base_task;
   }
 
-  virtual void OnRedirect(const ServerInformation& redirect_server) OVERRIDE {
+  void OnRedirect(const ServerInformation& redirect_server) override {
     state_ = REDIRECTED;
     redirect_server_ = redirect_server;
   }
 
-  virtual void OnCredentialsRejected() OVERRIDE {
-    state_ = CREDENTIALS_REJECTED;
-  }
+  void OnCredentialsRejected() override { state_ = CREDENTIALS_REJECTED; }
 
-  virtual void OnSettingsExhausted() OVERRIDE {
-    state_ = SETTINGS_EXHAUSTED;
-  }
+  void OnSettingsExhausted() override { state_ = SETTINGS_EXHAUSTED; }
 
   DelegateState state() const { return state_; }
 
@@ -77,7 +73,7 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {
         scoped_ptr<net::HostResolver>(new net::HangingHostResolver()));
     Init();
   }
-  virtual ~MyTestURLRequestContext() {}
+  ~MyTestURLRequestContext() override {}
 };
 
 class SingleLoginAttemptTest : public ::testing::Test {
@@ -97,7 +93,7 @@ class SingleLoginAttemptTest : public ::testing::Test {
           "auth_mechanism"),
         attempt_(new SingleLoginAttempt(login_settings_, &fake_delegate_)) {}
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     message_loop_.RunUntilIdle();
   }