Add Startup Timing to CPM

chrome/browser/performance_monitor/performance_monitor_browsertest.cc

 // Copyright (c) 2012 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/test/base/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/performance_monitor/constants.h"
 #include "chrome/browser/performance_monitor/database.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/sessions/session_restore.h"
+#include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_navigation_observer.h"
+
+#if defined(OS_MACOSX)
+#include "base/mac/scoped_nsautorelease_pool.h"
+#endif
 
 using extensions::Extension;
 using performance_monitor::Event;
 
 namespace {
 // Helper struct to store the information of an extension; this is needed if the
 // pointer to the extension ever becomes invalid (e.g., if we uninstall the
 // extension).
 struct ExtensionBasicInfo {
   // Empty constructor for stl-container-happiness.
@@ skipping 126 matching lines @@
         Database::kDatabaseSequenceToken,
         FROM_HERE,
         base::Bind(&PerformanceMonitorBrowserTest::GetEventsOnBackgroundThread,
                    base::Unretained(this),
                    &events));
 
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
     return events;
   }
 
+  void GetStatsOnBackgroundThread(Database::MetricInfoVector* metrics,
+                                  MetricType type) {
+    *metrics = performance_monitor_->database()->GetStatsForActivityAndMetric(
+        type, base::Time(), base::Time::FromInternalValue(kint64max));
+  }
+
+  // A handle for getting statistics from the database (see previous comments on
+  // GetEvents() and GetEventsOnBackgroundThread).
+  Database::MetricInfoVector GetStats(MetricType type) {
+    content::BrowserThread::GetBlockingPool()->FlushForTesting();
+    ui_test_utils::RunAllPendingInMessageLoop();
+
+    Database::MetricInfoVector metrics;
+    content::BrowserThread::PostBlockingPoolSequencedTask(
+        Database::kDatabaseSequenceToken,
+        FROM_HERE,
+        base::Bind(&PerformanceMonitorBrowserTest::GetStatsOnBackgroundThread,
+                   base::Unretained(this),
+                   &metrics,
+                   type));
+
+    content::BrowserThread::GetBlockingPool()->FlushForTesting();
+    return metrics;
+  }
+
   // A handle for inserting a state value into the database, which must be done
   // on the background thread. This is useful for mocking up a scenario in which
   // the database has prior data stored. We mock synchronicity with
   // FlushForTesting().
   void AddStateValue(const std::string& key, const std::string& value) {
     content::BrowserThread::PostBlockingPoolSequencedTask(
         Database::kDatabaseSequenceToken,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&Database::AddStateValue),
                    base::Unretained(performance_monitor()->database()),
@@ skipping 64 matching lines @@
     CHECK(file_util::PathExists(second_profile_prefs_file));
 
     return true;
   }
 
  protected:
   std::string first_profile_name_;
   std::string second_profile_name_;
 };
 
+class PerformanceMonitorSessionRestoreBrowserTest
+    : public PerformanceMonitorBrowserTest {
+ public:
+  virtual void SetUpOnMainThread() OVERRIDE {
+    SessionStartupPref pref(SessionStartupPref::LAST);
+    SessionStartupPref::SetStartupPref(browser()->profile(), pref);
+#if defined(OS_CHROMEOS) || defined (OS_MACOSX)
+    // Undo the effect of kBrowserAliveWithNoWindows in defaults.cc so that we
+    // can get these test to work without quitting.
+    SessionServiceFactory::GetForProfile(browser()->profile())->
+        force_browser_not_alive_with_no_windows_ = true;
+#endif
+
+    PerformanceMonitorBrowserTest::SetUpOnMainThread();
+  }
+
+  Browser* QuitBrowserAndRestore(Browser* browser, int expected_tab_count) {
+    Profile* profile = browser->profile();
+
+    // Close the browser.
+    g_browser_process->AddRefModule();
+    content::WindowedNotificationObserver observer(
+        chrome::NOTIFICATION_BROWSER_CLOSED,
+        content::NotificationService::AllSources());
+    browser->window()->Close();
+#if defined(OS_MACOSX)
+    // BrowserWindowController depends on the auto release pool being recycled
+    // in the message loop to delete itself, which frees the Browser object
+    // which fires this event.
+    AutoreleasePool()->Recycle();
+#endif
+    observer.Wait();
+
+    // Create a new window, which should trigger session restore.
+    ui_test_utils::BrowserAddedObserver window_observer;
+    content::TestNavigationObserver navigation_observer(
+        content::NotificationService::AllSources(), NULL, expected_tab_count);
+    chrome::NewEmptyWindow(profile);
+    Browser* new_browser = window_observer.WaitForSingleNewBrowser();
+    navigation_observer.Wait();
+    g_browser_process->ReleaseModule();
+
+    return new_browser;
+  }
+};
+
 // Test that PerformanceMonitor will correctly record an extension installation
 // event.
 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, InstallExtensionEvent) {
   FilePath extension_path;
   PathService::Get(chrome::DIR_TEST_DATA, &extension_path);
   extension_path = extension_path.AppendASCII("performance_monitor")
                                  .AppendASCII("extensions")
                                  .AppendASCII("simple_extension_v1");
   const Extension* extension = LoadExtension(extension_path);
 
@@ skipping 267 matching lines @@
   CheckEventType(EVENT_UNCLEAN_EXIT, events[1]);
 
   std::string event_profile;
   ASSERT_TRUE(events[0]->data()->GetString("profileName", &event_profile));
   ASSERT_EQ(first_profile_name_, event_profile);
 
   ASSERT_TRUE(events[1]->data()->GetString("profileName", &event_profile));
   ASSERT_EQ(second_profile_name_, event_profile);
 }
 
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, StartupTime) {
+  // Since the test itself is limited to a timeout of 45 seconds, we should
+  // never report a startup time of a minute or more.
+  const base::TimeDelta kMaxStartupTime = base::TimeDelta::FromMinutes(1);

[Yoyo Zhou, 2012/07/31 09:57:32]

Seems like you could put this in an anonymous namespace, since it's useful in
more than one test. Also, you could err on the conservative side and make this,
say, 1 hour. (Who knows if in the future, test timeouts might be longer?)

[Devlin, 2012/07/31 16:43:40]

Moved to anonymous namespace, but I'm not sure about putting it as an hour. I
see your reasoning, but all this test does is start the browser...I would think
that if the browser ever took even a minute to just start up, we would have a
problem, regardless of testing timeouts. I put it to three minutes to account
for extreme edge cases, but it seems to me that if we ever go longer than that,
we have a problem anyway, right? (If you still want this as an hour, I'll change
it - I just feel like the test is less powerful.)

+
+  Database::MetricInfoVector metrics = GetStats(METRIC_TEST_STARTUP_TIME);
+
+  ASSERT_EQ(1u, metrics.size());
+  ASSERT_LT(metrics[0].value, kMaxStartupTime.ToInternalValue());
+}
+
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorSessionRestoreBrowserTest,
+                       StartupWithSessionRestore) {
+  const base::TimeDelta kMaxStartupTime = base::TimeDelta::FromMinutes(1);
+
+  ui_test_utils::NavigateToURL(
+      browser(),
+      ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
+                                FilePath(FILE_PATH_LITERAL("title1.html"))));
+
+  QuitBrowserAndRestore(browser(), 1);
+
+  Database::MetricInfoVector metrics = GetStats(METRIC_TEST_STARTUP_TIME);
+  ASSERT_EQ(1u, metrics.size());
+  ASSERT_LT(metrics[0].value, kMaxStartupTime.ToInternalValue());
+
+  metrics = GetStats(METRIC_SESSION_RESTORE_TIME);
+  ASSERT_EQ(1u, metrics.size());
+  ASSERT_LT(metrics[0].value, kMaxStartupTime.ToInternalValue());
+}
+
 }  // namespace performance_monitor