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

Unified Diff: components/browsing_data_ui/history_notice_utils_unittest.cc

Issue 1983073002: Query the existence other forms of browsing history. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments, re-added protobuf Created 4 years, 7 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: components/browsing_data_ui/history_notice_utils_unittest.cc
diff --git a/components/browsing_data_ui/history_notice_utils_unittest.cc b/components/browsing_data_ui/history_notice_utils_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f5367c351cd6428489bf42b97470247e3cc9c55b
--- /dev/null
+++ b/components/browsing_data_ui/history_notice_utils_unittest.cc
@@ -0,0 +1,188 @@
+// Copyright 2016 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 "components/browsing_data_ui/history_notice_utils.h"
+
+#include <memory>
+
+#include "base/callback.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "components/history/core/test/fake_web_history_service.h"
+#include "components/signin/core/browser/account_tracker_service.h"
+#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
+#include "components/signin/core/browser/fake_signin_manager.h"
+#include "components/signin/core/browser/test_signin_client.h"
+#include "components/sync_driver/fake_sync_service.h"
+#include "components/version_info/version_info.h"
+#include "net/http/http_status_code.h"
+#include "net/url_request/url_request_test_util.h"
+#include "sync/internal_api/public/base/model_type.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace browsing_data_ui {
+
+namespace {
+
+class TestSyncService : public sync_driver::FakeSyncService {
+ public:
+ // Getters (FakeSyncService implementation). ---------------------------------
+ bool IsSyncActive() const override {
+ return sync_active_;
+ }
+
+ syncer::ModelTypeSet GetActiveDataTypes() const override {
+ return data_types_;
+ }
+
+ bool IsUsingSecondaryPassphrase() const override {
+ return passphrase_;
+ }
+
+ // Setters. ------------------------------------------------------------------
+ void SetSyncActive(bool active) {
sdefresne 2016/05/24 08:32:29 nit, style: this should be "set_sync_active" as it
msramek 2016/05/24 12:03:00 Done. For consistency, I renamed the underlying va
+ sync_active_ = active;
+ }
+
+ void SetActiveDataTypes(syncer::ModelTypeSet data_types) {
sdefresne 2016/05/24 08:32:29 ditto
msramek 2016/05/24 12:03:00 Done.
+ data_types_ = data_types;
+ }
+
+ void SetUsingSecondaryPassphrase(bool passphrase) {
sdefresne 2016/05/24 08:32:29 ditto
msramek 2016/05/24 12:03:00 Done.
+ passphrase_ = passphrase;
+ }
+
+ private:
+ syncer::ModelTypeSet data_types_;
+ bool passphrase_ = false;
+ bool sync_active_ = false;
+};
+
+} // namespace
+
+
+class HistoryNoticeUtilsTest : public ::testing::Test {
+ public:
+ HistoryNoticeUtilsTest()
+ : signin_client_(nullptr),
+ signin_manager_(&signin_client_, &account_tracker_) {
+ }
+
+ void SetUp() override {
+ sync_service_.reset(new TestSyncService());
+ history_service_.reset(new history::FakeWebHistoryService(
+ &oauth2_token_service_,
+ &signin_manager_,
+ url_request_context_));
+ history_service_->SetupFakeResponse(true /* success */, net::HTTP_OK);
+ }
+
+ TestSyncService* sync_service() {
+ return sync_service_.get();
+ }
+
+ history::FakeWebHistoryService* history_service() {
+ return history_service_.get();
+ }
+
+ void ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(
+ bool expected_test_case_result) {
+ bool got_result = false;
+
+ ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
+ sync_service_.get(),
+ history_service_.get(),
+ version_info::Channel::STABLE,
+ false /* is_tablet */,
+ base::Bind(
+ &HistoryNoticeUtilsTest::Callback,
+ base::Unretained(this),
+ base::Unretained(&got_result)));
+
+ if (!got_result) {
+ run_loop_.reset(new base::RunLoop());
+ run_loop_->Run();
+ }
+
+ // Process the DeleteSoon() called on MergeBooleanCallbacks, otherwise
+ // this it will be considered to be leaked.
+ base::MessageLoop::current()->RunUntilIdle();
+
+ EXPECT_EQ(expected_test_case_result, result_);
+ }
+
+ private:
+ void Callback(bool* got_result, bool result) {
+ *got_result = true;
+ result_ = result;
+
+ if (run_loop_)
+ run_loop_->Quit();
+ }
+
+ FakeProfileOAuth2TokenService oauth2_token_service_;
+ AccountTrackerService account_tracker_;
+ TestSigninClient signin_client_;
+ FakeSigninManagerBase signin_manager_;
+ scoped_refptr<net::URLRequestContextGetter> url_request_context_;
+ std::unique_ptr<TestSyncService> sync_service_;
+ std::unique_ptr<history::FakeWebHistoryService> history_service_;
+
+ std::unique_ptr<base::RunLoop> run_loop_;
+ bool result_;
+
+ base::MessageLoop message_loop_;
+};
+
+TEST_F(HistoryNoticeUtilsTest, NotSyncing) {
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+}
+
+TEST_F(HistoryNoticeUtilsTest, SyncingWithWrongParameters) {
+ sync_service()->SetSyncActive(true);
+
+ // Regardless of the state of the web history...
+ history_service()->SetWebAndAppActivityEnabled(true);
+ history_service()->SetOtherFormsOfBrowsingHistoryPresent(true);
+
+ // ...the response is false if there's custom passphrase...
+ sync_service()->SetActiveDataTypes(syncer::ModelTypeSet::All());
+ sync_service()->SetUsingSecondaryPassphrase(true);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+
+ // ...or even if there's no custom passphrase, but we're not syncing history.
+ syncer::ModelTypeSet only_passwords(syncer::PASSWORDS);
+ sync_service()->SetActiveDataTypes(only_passwords);
+ sync_service()->SetUsingSecondaryPassphrase(false);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+}
+
+TEST_F(HistoryNoticeUtilsTest, WebHistoryStates) {
+ // If history Sync is active...
+ sync_service()->SetSyncActive(true);
+ sync_service()->SetActiveDataTypes(syncer::ModelTypeSet::All());
+
+ // ...the result is true if both web history queries return true...
+ history_service()->SetWebAndAppActivityEnabled(true);
+ history_service()->SetOtherFormsOfBrowsingHistoryPresent(true);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(true);
+
+ // ...but not otherwise.
+ history_service()->SetOtherFormsOfBrowsingHistoryPresent(false);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+ history_service()->SetWebAndAppActivityEnabled(false);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+ history_service()->SetOtherFormsOfBrowsingHistoryPresent(true);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+
+ // Invalid responses from the web history are interpreted as false.
+ history_service()->SetWebAndAppActivityEnabled(true);
+ history_service()->SetOtherFormsOfBrowsingHistoryPresent(true);
+ history_service()->SetupFakeResponse(true, net::HTTP_INTERNAL_SERVER_ERROR);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+ history_service()->SetupFakeResponse(false, net::HTTP_OK);
+ ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
+}
+
+} // namespace browsing_data_ui

Powered by Google App Engine
This is Rietveld 408576698