Add Startup Timing to CPM

chrome/browser/sessions/session_restore_browsertest.cc

Index: chrome/browser/sessions/session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 154bf0ab34e6d726b21b28bb5e58274a313e8384..beb317dd9a9b0756b65a12a295bcae6ff25a6705 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -13,6 +13,7 @@
 #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/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ -51,8 +52,12 @@ class SessionRestoreTest : public InProcessBrowserTest {
     if (strcmp(test_info->name(), "NoSessionRestoreNewWindowChromeOS")) {
       // 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;
+      // SessionServiceFactory::GetForProfile(browser()->profile())->

[sky, 2012/08/07 23:19:12]

remove these two lines.

+      //     force_browser_not_alive_with_no_windows_ = true;
+      SessionServiceTestHelper helper(
+          SessionServiceFactory::GetForProfile(browser()->profile()));
+      helper.SetForceBrowserNotAliveWithNoWindows(true);
+      helper.ReleaseService();
     }
 #endif
   }