Reland r242290, r241609, r242134.

chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc

Index: chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
index 7460a5e142cbb87d1c7490ad66a7798fe53e8362..87685c0bf6f22441584e5dff49d9e09b8c864ac0 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
@@ -5,7 +5,10 @@
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/extensions/test_extension_service.h"
+#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -19,6 +22,8 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
 
+  virtual void SetUp() OVERRIDE;
+
  protected:
   class Window : public TestBrowserWindow {
    public:
@@ -46,6 +51,14 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegateTest);
 };
 
+void BookmarkBubbleSignInDelegateTest::SetUp() {
+  BrowserWithTestWindowTest::SetUp();
+  // Adds TestExtensionSystem, since signin uses the gaia auth extension.
+  static_cast<extensions::TestExtensionSystem*>(
+      extensions::ExtensionSystem::Get(profile()))->CreateExtensionService(
+          CommandLine::ForCurrentProcess(), base::FilePath(), false);
+}
+
 TEST_F(BookmarkBubbleSignInDelegateTest, OnSignInLinkClicked) {
   int starting_tab_count = browser()->tab_strip_model()->count();