| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManagerStateWaiter); | 126 DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManagerStateWaiter); |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 } // namespace | 129 } // namespace |
| 130 | 130 |
| 131 class OAuth2Test : public OobeBaseTest { | 131 class OAuth2Test : public OobeBaseTest { |
| 132 protected: | 132 protected: |
| 133 OAuth2Test() {} | 133 OAuth2Test() {} |
| 134 | 134 |
| 135 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 135 virtual void SetUpCommandLine(CommandLine* command_line) override { |
| 136 OobeBaseTest::SetUpCommandLine(command_line); | 136 OobeBaseTest::SetUpCommandLine(command_line); |
| 137 | 137 |
| 138 // Disable sync sinc we don't really need this for these tests and it also | 138 // Disable sync sinc we don't really need this for these tests and it also |
| 139 // makes OAuth2Test.MergeSession test flaky http://crbug.com/408867. | 139 // makes OAuth2Test.MergeSession test flaky http://crbug.com/408867. |
| 140 command_line->AppendSwitch(switches::kDisableSync); | 140 command_line->AppendSwitch(switches::kDisableSync); |
| 141 } | 141 } |
| 142 | 142 |
| 143 void SetupGaiaServerForNewAccount() { | 143 void SetupGaiaServerForNewAccount() { |
| 144 FakeGaia::MergeSessionParams params; | 144 FakeGaia::MergeSessionParams params; |
| 145 params.auth_sid_cookie = kTestAuthSIDCookie; | 145 params.auth_sid_cookie = kTestAuthSIDCookie; |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 | 790 |
| 791 if (!catcher.GetNextResult()) { | 791 if (!catcher.GetNextResult()) { |
| 792 std::string message = catcher.message(); | 792 std::string message = catcher.message(); |
| 793 ADD_FAILURE() << "Tests failed: " << message; | 793 ADD_FAILURE() << "Tests failed: " << message; |
| 794 } | 794 } |
| 795 | 795 |
| 796 EXPECT_TRUE(fake_google_.IsPageRequested()); | 796 EXPECT_TRUE(fake_google_.IsPageRequested()); |
| 797 } | 797 } |
| 798 | 798 |
| 799 } // namespace chromeos | 799 } // namespace chromeos |
| OLD | NEW |