Implement the 2016Q2 Translate UI designe spec out in

components/translate/core/browser/translate_prefs_unittest.cc

 // Copyright 2014 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/translate/core/browser/translate_prefs.h"
 
 #include <algorithm>
 #include <string>
-#include <vector>

[msw, 2016/04/29 20:00:03]

this file uses vector, leave this include here.

[ftang, 2016/04/29 22:37:03]

Done.

+#include <utility>
 
 #include "build/build_config.h"
 #include "components/pref_registry/testing_pref_service_syncable.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/translate/core/browser/translate_download_manager.h"
+#include "components/translate/core/browser/translate_prefs.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestLanguage[] = "en";
 
 }  // namespace
 
 namespace translate {
 
@@ skipping 124 matching lines @@
   void SetLastDeniedTime(const std::string& language, base::Time time) {
     DenialTimeUpdate update(prefs_.get(), language, 2);
     update.AddDenialTime(time);
   }
 
   base::Time GetLastDeniedTime(const std::string& language) {
     DenialTimeUpdate update(prefs_.get(), language, 2);
     return update.GetOldestDenialTime();
   }
 
+  void SetUp() override {
+    base::FeatureList::ClearInstanceForTesting();
+    base::FeatureList::SetInstance(base::WrapUnique(new base::FeatureList()));
+  }
+
+  void TurnOnTranslate2016Q2UIFlag() {
+    base::FeatureList::ClearInstanceForTesting();
+    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
+    feature_list->InitializeFromCommandLine(
+        translate::kTranslateUI2016Q2.name, "");

[msw, 2016/04/29 20:00:02]

std::string

[ftang, 2016/04/29 22:37:03]

Done.

+    base::FeatureList::SetInstance(std::move(feature_list));
+  }
+
   std::unique_ptr<user_prefs::TestingPrefServiceSyncable> prefs_;
   std::unique_ptr<translate::TranslatePrefs> translate_prefs_;
 
   // Shared time constants.
   base::Time now_;
   base::Time two_days_ago_;
 };
 
+TEST_F(TranslatePrefTest, IsTooOftenDeniedIn2016Q2UI) {
+  TurnOnTranslate2016Q2UIFlag();
+
+  translate_prefs_->ResetDenialState();
+  ASSERT_FALSE(translate_prefs_->IsTooOftenDenied(kTestLanguage));

[msw, 2016/04/29 20:00:02]

nit: assert is a bit heavy-handed; expect would be okay throughout these tests.

[ftang, 2016/04/29 22:37:03]

Done.

+
+  for (int i = 0; i < 3; i++) {
+    translate_prefs_->IncrementTranslationDeniedCount(kTestLanguage);
+    ASSERT_FALSE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
+  }
+
+  translate_prefs_->IncrementTranslationDeniedCount(kTestLanguage);
+  ASSERT_TRUE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
+}
+
+TEST_F(TranslatePrefTest, IsTooOftenIgnoredIn2016Q2UI) {

[msw, 2016/04/29 20:00:03]

Maybe add some test that intermixes denied and ignored? Is there some special
behavior for that?

[ftang, 2016/04/29 22:37:03]

Acknowledged.

[msw, 2016/04/29 23:43:39]

I guess this means 'no'...

+  TurnOnTranslate2016Q2UIFlag();
+
+  translate_prefs_->ResetDenialState();
+  ASSERT_FALSE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
+
+  for (int i = 0; i < 10; i++) {
+    translate_prefs_->IncrementTranslationIgnoredCount(kTestLanguage);
+    ASSERT_FALSE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
+  }
+
+  translate_prefs_->IncrementTranslationIgnoredCount(kTestLanguage);
+  ASSERT_TRUE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
+}
+
 TEST_F(TranslatePrefTest, UpdateLastDeniedTime) {
   // Test that denials with more than 24 hours difference between them do not
   // block the language.
   translate_prefs_->ResetDenialState();
   SetLastDeniedTime(kTestLanguage, two_days_ago_);
   ASSERT_FALSE(translate_prefs_->IsTooOftenDenied(kTestLanguage));
   translate_prefs_->UpdateLastDeniedTime(kTestLanguage);
   base::Time last_denied = GetLastDeniedTime(kTestLanguage);
   EXPECT_FALSE(last_denied.is_max());
   EXPECT_GE(last_denied, now_);
@@ skipping 99 matching lines @@
   update.AddDenialTime(now_);
   EXPECT_EQ(update.GetOldestDenialTime(),
             now_ - base::TimeDelta::FromMinutes(3));
 
   update.AddDenialTime(now_);
   EXPECT_EQ(update.GetOldestDenialTime(),
             now_ - base::TimeDelta::FromMinutes(2));
 }
 
 }  // namespace translate