Updates the histograms for IMF and IMEs according to the new design.

chrome/browser/chromeos/input_method/input_method_engine_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 "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h"
 
 namespace chromeos {
 
 namespace input_method {
 namespace {
 
 const char kTestExtensionId[] = "mppnpdlheglhdfmldimlhpnegondlapf";
 const char kTestExtensionId2[] = "dmpipdbjkoajgdeppkffbjhngfckdloi";
 const char kTestImeComponentId[] = "test_engine_id";
 
 const char* kHistogramNames[] = {
-    "InputMethod.Enable.test_engine_id", "InputMethod.Commit.test_engine_id",
-    "InputMethod.CommitCharacter.test_engine_id",
+    "InputMethod.CommitLength",
 };
 
 scoped_ptr<base::HistogramSamples> GetHistogramSamples(
     const char* histogram_name) {
   base::HistogramBase* histogram =
       base::StatisticsRecorder::FindHistogram(histogram_name);
   EXPECT_NE(static_cast<base::HistogramBase*>(NULL), histogram);
   return histogram->SnapshotSamples().Pass();
 }
 
@@ skipping 122 matching lines @@
   }
 
   void ExpectNewSample(const char* histogram_name,
                        base::HistogramBase::Sample sample,
                        int total_count,
                        int sample_count) {
     scoped_ptr<base::HistogramSamples> delta_samples(
         GetHistogramSamplesDelta(histogram_name));
     EXPECT_EQ(total_count, delta_samples->TotalCount());
     EXPECT_EQ(sample_count, delta_samples->GetCount(sample));
   }

[Ilya Sherman, 2014/09/16 00:00:28]

Please use base::HistogramTester [1] rather than re-implementing some of the
functionality.  (Fine to make this change in a follow-up CL, but please do clean
this up!)

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/base/test/histogra...

[Shu Chen, 2014/09/16 16:36:29]

Done. But the test failed at ExpectUniqueSample(), expect 1 but actual 3. Do you
have any ideas?

[Ilya Sherman, 2014/09/16 21:51:48]

Thanks for updating the test code!

ExpectUniqueSample() is intended to be used for a histogram where only one
bucket is filled.  Since that's not the case that you're testing, you want to
use ExpectBucketCount() instead.

[Shu Chen, 2014/09/17 15:17:27]

Done.

 
   void CreateEngine(bool whitelisted) {
     engine_.reset(new InputMethodEngine());
     observer_ = new TestObserver();
     scoped_ptr<InputMethodEngineInterface::Observer> observer_ptr(observer_);
     engine_->Initialize(observer_ptr.Pass(),
                         whitelisted ? kTestExtensionId : kTestExtensionId2);
   }
 
   void FocusIn(ui::TextInputType input_type) {
@@ skipping 90 matching lines @@
   FocusIn(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_EQ(ONFOCUS, observer_->GetCallsBitmapAndReset());
   engine_->Disable();
   EXPECT_EQ(DEACTIVATED, observer_->GetCallsBitmapAndReset());
 }
 
 TEST_F(InputMethodEngineTest, TestHistograms) {
   CreateEngine(true);
   FocusIn(ui::TEXT_INPUT_TYPE_TEXT);
   engine_->Enable(kTestImeComponentId);
+  std::vector<InputMethodEngineInterface::SegmentInfo> segments;
+  engine_->SetComposition(
+      engine_->GetCotextIdForTesting(), "test", 0, 0, 0, segments, NULL);
   std::string error;
-  ExpectNewSample("InputMethod.Enable.test_engine_id", 1, 1, 1);
   engine_->CommitText(1, "input", &error);
-  engine_->CommitText(1, "入力", &error);
-  engine_->CommitText(1, "input入力", &error);
-  ExpectNewSample("InputMethod.Commit.test_engine_id", 1, 3, 3);
-  ExpectNewSample("InputMethod.CommitCharacter.test_engine_id", 5, 3, 1);
-  ExpectNewSample("InputMethod.CommitCharacter.test_engine_id", 2, 3, 1);
-  ExpectNewSample("InputMethod.CommitCharacter.test_engine_id", 7, 3, 1);
+  engine_->CommitText(1,
+                      "\xE5\x85\xA5\xE5\x8A\x9B",  // 2 UTF-8 characters
+                      &error);
+  engine_->CommitText(1, "input\xE5\x85\xA5\xE5\x8A\x9B", &error);
+  ExpectNewSample("InputMethod.CommitLength", 5, 3, 1);
+  ExpectNewSample("InputMethod.CommitLength", 2, 3, 1);
+  ExpectNewSample("InputMethod.CommitLength", 7, 3, 1);
 }
 
 }  // namespace input_method
 }  // namespace chromeos