Miscellaneous fixes to DataUse UI

chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc

 // Copyright 2015 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 "chrome/browser/android/data_usage/data_use_ui_tab_model.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace chrome {
 
 namespace android {
 
 namespace {
 
+const char kFooLabel[] = "foo_label";
+const char kFooPackage[] = "com.foo";
+
 class TestDataUseTabModel : public DataUseTabModel {
  public:
   TestDataUseTabModel() {}
   ~TestDataUseTabModel() override {}
 
   using DataUseTabModel::NotifyObserversOfTrackingStarting;
   using DataUseTabModel::NotifyObserversOfTrackingEnding;
 };
 
 class DataUseUITabModelTest : public testing::Test {
@@ skipping 46 matching lines @@
   scoped_ptr<data_usage::DataUseAggregator> data_use_aggregator_;
   scoped_ptr<ExternalDataUseObserver> external_data_use_observer_;
   scoped_ptr<TestDataUseTabModel> data_use_tab_model_;
 };
 
 }  // namespace
 
 // Tests that DataUseTabModel is notified of tab closure and navigation events,
 // and DataUseTabModel notifies DataUseUITabModel.
 TEST_F(DataUseUITabModelTest, ReportTabEventsTest) {
-  const char kFooLabel[] = "foo_label";
-  const char kFooPackage[] = "com.foo";
-
   std::vector<std::string> url_regexes;
   url_regexes.push_back(
       "http://www[.]foo[.]com/#q=.*|https://www[.]foo[.]com/#q=.*");
   RegisterURLRegexes(std::vector<std::string>(url_regexes.size(), kFooPackage),
                      url_regexes,
                      std::vector<std::string>(url_regexes.size(), kFooLabel));
 
   const struct {
     ui::PageTransition transition_type;
     std::string expected_label;
@@ skipping 10 matching lines @@
   };
 
   SessionID::id_type foo_tab_id = 100;
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     // Start a new tab.
     ++foo_tab_id;
     data_use_ui_tab_model()->ReportBrowserNavigation(
         GURL("https://www.foo.com/#q=abc"), tests[i].transition_type,
         foo_tab_id);
-    // Wait for DataUseUITabModel to notify DataUseTabModel, which should notify
-    // DataUseUITabModel back.
-    base::RunLoop().RunUntilIdle();
 
     // |data_use_ui_tab_model| should receive callback about starting of
     // tracking of data usage for |foo_tab_id|.
     EXPECT_EQ(!tests[i].expected_label.empty(),
               data_use_ui_tab_model()->HasDataUseTrackingStarted(foo_tab_id))
         << i;
     EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(foo_tab_id))
         << i;
     EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
         << i;
 
     std::string got_label;
     data_use_tab_model()->GetLabelForTabAtTime(
         foo_tab_id, base::TimeTicks::Now(), &got_label);
     EXPECT_EQ(tests[i].expected_label, got_label) << i;
 
     // Report closure of tab.
     data_use_ui_tab_model()->ReportTabClosure(foo_tab_id);
-    base::RunLoop().RunUntilIdle();
 
     // DataUse object should not be labeled.
     EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id));
     data_use_tab_model()->GetLabelForTabAtTime(
         foo_tab_id, base::TimeTicks::Now() + base::TimeDelta::FromMinutes(10),
         &got_label);
     EXPECT_EQ(std::string(), got_label) << i;
   }
 
   const SessionID::id_type bar_tab_id = foo_tab_id + 1;
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   data_use_ui_tab_model()->ReportCustomTabInitialNavigation(
-      bar_tab_id, std::string(), kFooPackage);
-  base::RunLoop().RunUntilIdle();
+      bar_tab_id, kFooPackage, std::string());
 
   // |data_use_ui_tab_model| should receive callback about starting of
   // tracking of data usage for |bar_tab_id|.
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(bar_tab_id));
 
   data_use_ui_tab_model()->ReportTabClosure(bar_tab_id);
-  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(bar_tab_id));
 }
 
 // Tests if the Entrance/Exit UI state is tracked correctly.
 TEST_F(DataUseUITabModelTest, EntranceExitState) {
   const SessionID::id_type kFooTabId = 1;
   const SessionID::id_type kBarTabId = 2;
   const SessionID::id_type kBazTabId = 3;
 
   // HasDataUseTrackingStarted should return true only once.
   data_use_tab_model()->NotifyObserversOfTrackingStarting(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kFooTabId));
 
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kBarTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kBarTabId));
 
   // HasDataUseTrackingEnded should return true only once.
   data_use_tab_model()->NotifyObserversOfTrackingEnding(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
 
   // The tab enters the tracking state again.
   data_use_tab_model()->NotifyObserversOfTrackingStarting(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
 
   // The tab exits the tracking state.
   data_use_tab_model()->NotifyObserversOfTrackingEnding(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
 
   // The tab enters the tracking state again.
   data_use_tab_model()->NotifyObserversOfTrackingStarting(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   data_use_tab_model()->NotifyObserversOfTrackingStarting(kFooTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kFooTabId));
 
   // ShowExit should return true only once.
   data_use_tab_model()->NotifyObserversOfTrackingEnding(kBarTabId);
-  base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kBarTabId));
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kBarTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kBarTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kBarTabId));
 
   data_use_ui_tab_model()->ReportTabClosure(kFooTabId);
   data_use_ui_tab_model()->ReportTabClosure(kBarTabId);
 
   //  HasDataUseTrackingStarted/Ended should return false for closed tabs.
   data_use_tab_model()->NotifyObserversOfTrackingStarting(kBazTabId);
-  base::RunLoop().RunUntilIdle();
   data_use_ui_tab_model()->ReportTabClosure(kBazTabId);
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(kBazTabId));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(kBazTabId));
 }
 
+// Tests if the Entrance/Exit UI state is tracked correctly.
+TEST_F(DataUseUITabModelTest, EntranceExitStateWithDialogBox) {

[megjablon, 2015/12/29 00:38:24]

Maybe name EntraceExitStateForDialog?

[tbansal1, 2015/12/29 01:18:41]

Done.

+  const SessionID::id_type kFooTabId = 1;
+
+  std::vector<std::string> url_regexes;
+  url_regexes.push_back(
+      "http://www[.]foo[.]com/#q=.*|https://www[.]foo[.]com/#q=.*");
+  RegisterURLRegexes(std::vector<std::string>(url_regexes.size(), kFooPackage),
+                     url_regexes,
+                     std::vector<std::string>(url_regexes.size(), kFooLabel));
+
+  SessionID::id_type foo_tab_id = kFooTabId;
+
+  const struct {
+    // True if a dialog box was shown to the user. It may not be shown if the
+    // user has previously selected the option to opt out.
+    bool continue_dialog_box_shown;
+    bool user_proceeded_with_navigation;
+  } tests[] = {
+      {false, false}, {true, true}, {true, false},
+  };
+
+  for (size_t i = 0; i < arraysize(tests); ++i) {
+    // Start a new tab.
+    ++foo_tab_id;
+    data_use_ui_tab_model()->ReportBrowserNavigation(
+        GURL("https://www.foo.com/#q=abc"), ui::PAGE_TRANSITION_GENERATED,
+        foo_tab_id);
+
+    // |data_use_ui_tab_model| should receive callback about starting of
+    // tracking of data usage for |foo_tab_id|.
+    EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(foo_tab_id))
+        << i;
+    EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(foo_tab_id))
+        << i;
+    EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
+        << i;
+
+    std::string got_label;
+    data_use_tab_model()->GetLabelForTabAtTime(
+        foo_tab_id, base::TimeTicks::Now(), &got_label);
+    EXPECT_EQ(kFooLabel, got_label) << i;
+
+    // Tab enters non-tracking state.
+    data_use_ui_tab_model()->ReportBrowserNavigation(
+        GURL("https://www.bar.com/#q=abc"),
+        ui::PageTransition::PAGE_TRANSITION_TYPED, foo_tab_id);
+
+    EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
+        << i;
+    EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
+        << i;
+
+    // Tab enters tracking state.
+    data_use_ui_tab_model()->ReportBrowserNavigation(
+        GURL("https://www.foo.com/#q=abc"), ui::PAGE_TRANSITION_GENERATED,
+        foo_tab_id);
+
+    EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(foo_tab_id))
+        << i;
+
+    // Tab may enter non-tracking state.
+    EXPECT_TRUE(data_use_ui_tab_model()->WouldDataUseTrackingEnd(
+        "https://www.bar.com/#q=abc", ui::PageTransition::PAGE_TRANSITION_TYPED,
+        foo_tab_id));
+    if (tests[i].continue_dialog_box_shown &&
+        tests[i].user_proceeded_with_navigation) {
+      data_use_ui_tab_model()->UserClickedContinueOnDialogBox(foo_tab_id);
+    }
+
+    if (tests[i].user_proceeded_with_navigation) {
+      data_use_ui_tab_model()->ReportBrowserNavigation(
+          GURL("https://www.bar.com/#q=abc"),
+          ui::PageTransition::PAGE_TRANSITION_TYPED, foo_tab_id);
+    }
+
+    const std::string expected_label =
+        tests[i].user_proceeded_with_navigation ? "" : kFooLabel;
+    data_use_tab_model()->GetLabelForTabAtTime(
+        foo_tab_id, base::TimeTicks::Now(), &got_label);
+    EXPECT_EQ(expected_label, got_label) << i;
+
+    if (tests[i].user_proceeded_with_navigation) {
+      // No UI element should be shown afterwards if the dialog box was shown
+      // before.
+      EXPECT_NE(tests[i].continue_dialog_box_shown,
+                data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
+          << i;
+    } else {
+      EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id))
+          << i;
+    }
+  }
+}
+
 // Checks if page transition type is converted correctly.
 TEST_F(DataUseUITabModelTest, ConvertTransitionType) {
   DataUseTabModel::TransitionType transition_type;
   EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_TYPED), &transition_type));
   EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
   EXPECT_TRUE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_TYPED | 0xFF00),
       &transition_type));
   EXPECT_EQ(DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION, transition_type);
@@ skipping 65 matching lines @@
   EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_MANUAL_SUBFRAME),
       &transition_type));
   EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_FORM_SUBMIT), &transition_type));
 }
 
 }  // namespace android
 
 }  // namespace chrome