 Chromium Code Reviews
 Chromium Code Reviews Issue 1169503002:
  Do not record startup metrics when non-browser UI was displayed  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1169503002:
  Do not record startup metrics when non-browser UI was displayed  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: chrome/browser/ui/profile_error_browsertest.cc | 
| diff --git a/chrome/browser/ui/profile_error_browsertest.cc b/chrome/browser/ui/profile_error_browsertest.cc | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..bc9d3073d92e208d3f1032c6e2f45d0fbb764bc3 | 
| --- /dev/null | 
| +++ b/chrome/browser/ui/profile_error_browsertest.cc | 
| @@ -0,0 +1,99 @@ | 
| +// 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 <string> | 
| + | 
| +#include "base/files/file_path.h" | 
| +#include "base/files/file_util.h" | 
| +#include "base/path_service.h" | 
| +#include "base/strings/string_util.h" | 
| +#include "base/test/histogram_tester.h" | 
| +#include "chrome/browser/ui/simple_message_box_internal.h" | 
| +#include "chrome/common/chrome_constants.h" | 
| +#include "chrome/common/chrome_paths.h" | 
| +#include "chrome/test/base/in_process_browser_test.h" | 
| +#include "chrome/test/base/testing_profile.h" | 
| +#include "chrome/test/base/ui_test_utils.h" | 
| + | 
| +namespace { | 
| + | 
| +class ProfileErrorBrowserTest : public InProcessBrowserTest, | 
| + public testing::WithParamInterface<bool> { | 
| + // A fixture that allows testing histograms reporting when faced with a | 
| + // corrupted profile. The boolean parameter forces the creation of an empty or | 
| + // corrupted profile, allowing to test both the corruption case and that what | 
| + // it is testing indeed happens differently when not under corruption. | 
| + public: | 
| + ProfileErrorBrowserTest() : do_corrupt_(GetParam()) {} | 
| + | 
| + bool SetUpUserDataDirectory() override { | 
| + base::FilePath profile_dir; | 
| + if (!PathService::Get(chrome::DIR_USER_DATA, &profile_dir)) { | 
| + ADD_FAILURE(); | 
| + return false; | 
| + } | 
| + profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir); | 
| + if (!base::CreateDirectory(profile_dir)) { | 
| + ADD_FAILURE(); | 
| + return false; | 
| + } | 
| + const base::FilePath pref_file = | 
| + profile_dir.Append(chrome::kPreferencesFilename); | 
| + | 
| + // Write either an empty or an invalid string to the user profile as | 
| + // determined by the boolean parameter. | 
| + const std::string kUserProfileData(do_corrupt_ ? "invalid json" : "{}"); | 
| + if (!base::WriteFile(pref_file, kUserProfileData.c_str(), | 
| + kUserProfileData.size())) { | 
| + ADD_FAILURE(); | 
| + return false; | 
| + } | 
| + return true; | 
| + } | 
| + | 
| + void SetUpInProcessBrowserTestFixture() override { | 
| + InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 
| + | 
| + // Skip showing the error message box in order to avoid freezing the main | 
| + // thread. | 
| + chrome::internal::g_should_skip_message_box_for_test = true; | 
| + } | 
| + | 
| + protected: | 
| + // Histogram value verifier. | 
| + const base::HistogramTester histogram_tester_; | 
| + | 
| + // Whether the test fixture and test should set up a corrupted profile and | 
| + // expect a reaction to one. | 
| + const bool do_corrupt_; | 
| +}; | 
| + | 
| +#if defined(OS_CHROMEOS) | 
| +// Disable the test on chromos since kernel controls the user profile thus we | 
| +// won't be able to corrupt it. | 
| +#define MAYBE_CorruptedProfile DISABLED_CorruptedProfile | 
| +#else | 
| +#define MAYBE_CorruptedProfile CorruptedProfile | 
| +#endif | 
| + | 
| +IN_PROC_BROWSER_TEST_P(ProfileErrorBrowserTest, MAYBE_CorruptedProfile) { | 
| + const char kPaintHistogram[] = "Startup.FirstWebContents.NonEmptyPaint"; | 
| + const char kLoadHistogram[] = "Startup.FirstWebContents.MainFrameLoad"; | 
| + | 
| + // Navigate to a URL so the first non-empty paint is registered. | 
| + ui_test_utils::NavigateToURL(browser(), GURL("http://www.example.com/")); | 
| + if (do_corrupt_) { | 
| + histogram_tester_.ExpectTotalCount(kPaintHistogram, 0); | 
| + histogram_tester_.ExpectTotalCount(kLoadHistogram, 0); | 
| + } else { | 
| 
Nico
2015/07/08 18:49:06
Since over 50% of the test body is this if, it see
 
gab
2015/07/08 18:55:01
The test fixture also sets things up differently b
 | 
| + histogram_tester_.ExpectTotalCount(kPaintHistogram, 1); | 
| + histogram_tester_.ExpectTotalCount(kLoadHistogram, 1); | 
| + } | 
| +} | 
| + | 
| +INSTANTIATE_TEST_CASE_P(ProfileErrorBrowserTestInstance, | 
| + ProfileErrorBrowserTest, | 
| + testing::Bool()); | 
| + | 
| +} // namespace |