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

Unified Diff: chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: rebased + comments updated Created 3 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: chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator_unittest.cc b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
similarity index 92%
rename from chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator_unittest.cc
rename to chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
index 4feb8716b451d31f1af29430dbde1be540033c17..ce080c8dfbab8fe7e4c24bf783f3d47c00da0be9 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator_unittest.cc
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -11,7 +11,7 @@
#include "base/run_loop.h"
#include "chrome/browser/chromeos/arc/arc_support_host.h"
#include "chrome/browser/chromeos/arc/extensions/fake_arc_support.h"
-#include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.h"
+#include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_default_negotiator.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
#include "chrome/common/pref_names.h"
@@ -23,10 +23,10 @@
namespace arc {
-class ArcTermsOfServiceNegotiatorTest : public testing::Test {
+class ArcTermsOfServiceDefaultNegotiatorTest : public testing::Test {
public:
- ArcTermsOfServiceNegotiatorTest() = default;
- ~ArcTermsOfServiceNegotiatorTest() override = default;
+ ArcTermsOfServiceDefaultNegotiatorTest() = default;
+ ~ArcTermsOfServiceDefaultNegotiatorTest() override = default;
void SetUp() override {
user_manager_enabler_ =
@@ -39,7 +39,7 @@ class ArcTermsOfServiceNegotiatorTest : public testing::Test {
support_host_ = base::MakeUnique<ArcSupportHost>(profile_.get());
fake_arc_support_ = base::MakeUnique<FakeArcSupport>(support_host_.get());
- negotiator_ = base::MakeUnique<ArcTermsOfServiceNegotiator>(
+ negotiator_ = base::MakeUnique<ArcTermsOfServiceDefaultNegotiator>(
profile_->GetPrefs(), support_host());
}
@@ -66,7 +66,7 @@ class ArcTermsOfServiceNegotiatorTest : public testing::Test {
std::unique_ptr<FakeArcSupport> fake_arc_support_;
std::unique_ptr<ArcTermsOfServiceNegotiator> negotiator_;
- DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceNegotiatorTest);
+ DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceDefaultNegotiatorTest);
};
namespace {
@@ -103,7 +103,7 @@ ArcTermsOfServiceNegotiator::NegotiationCallback UpdateStatusCallback(
} // namespace
-TEST_F(ArcTermsOfServiceNegotiatorTest, Accept) {
+TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, Accept) {
// Show Terms of service page.
Status status = Status::PENDING;
negotiator()->StartNegotiation(UpdateStatusCallback(&status));
@@ -135,7 +135,7 @@ TEST_F(ArcTermsOfServiceNegotiatorTest, Accept) {
profile()->GetPrefs()->GetBoolean(prefs::kArcLocationServiceEnabled));
}
-TEST_F(ArcTermsOfServiceNegotiatorTest, Cancel) {
+TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, Cancel) {
// Show Terms of service page.
Status status = Status::PENDING;
negotiator()->StartNegotiation(UpdateStatusCallback(&status));
@@ -166,7 +166,7 @@ TEST_F(ArcTermsOfServiceNegotiatorTest, Cancel) {
profile()->GetPrefs()->GetBoolean(prefs::kArcLocationServiceEnabled));
}
-TEST_F(ArcTermsOfServiceNegotiatorTest, Retry) {
+TEST_F(ArcTermsOfServiceDefaultNegotiatorTest, Retry) {
// Show Terms of service page.
Status status = Status::PENDING;
negotiator()->StartNegotiation(UpdateStatusCallback(&status));

Powered by Google App Engine
This is Rietveld 408576698