Set timeout in sync setup

chrome/browser/ui/webui/sync_setup_handler.h

Index: chrome/browser/ui/webui/sync_setup_handler.h
diff --git a/chrome/browser/ui/webui/sync_setup_handler.h b/chrome/browser/ui/webui/sync_setup_handler.h
index 51cc5b2ee55f19a8cabaab2f292b128e4d95439e..8b331d93c6027a08f7212623236f9ab6f43dda7e 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.h
+++ b/chrome/browser/ui/webui/sync_setup_handler.h
@@ -7,6 +7,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/timer.h"
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -141,7 +142,10 @@ class SyncSetupHandler : public options2::OptionsPageUIHandler,
   // is running in the background.
   void DisplaySpinner();
 
-  // Returns true if this is the active login object.
+  // Displays an error dialog which shows timeout of starting the sync backend.
+  void DisplayTimeout();
+
+  // Returns true if we're the active login object.

[Andrew T Wilson (Slow), 2012/06/26 18:11:25]

Apparently the style guide discourages pronouns. You'll need to change this to
"if this object is the active login object"

[James Hawkins, 2012/06/26 23:00:14]

Yay!  Rationale: pronouns are ambiguous.

[peria, 2012/06/29 07:11:17]

Done.

   bool IsActiveLogin() const;
 
   // Initiates a login via the signin manager.
@@ -192,6 +196,10 @@ class SyncSetupHandler : public options2::OptionsPageUIHandler,
   // When setup starts without login UI, do not retry login and fail.
   bool retry_on_signin_failure_;
 
+  // The OneShotTimer object used to timeout of starting the sync backend
+  // service.
+  scoped_ptr<base::OneShotTimer<SyncSetupHandler> > backend_start_timer_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
 };