Reland r242290, r241609, r242134.

chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc

 // Copyright 2013 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/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"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/range/range.h"
 
 class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
 
+  virtual void SetUp() OVERRIDE;
+
  protected:
   class Window : public TestBrowserWindow {
    public:
     Window() : show_count_(0) {}
 
     int show_count() { return show_count_; }
 
    private:
     // TestBrowserWindow:
     virtual void Show() OVERRIDE {
       ++show_count_;
     }
 
     // Number of times that the Show() method has been called.
     int show_count_;
 
     DISALLOW_COPY_AND_ASSIGN(Window);
   };
 
   virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
     return new Window();
   }
 
  private:
   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();
 
   scoped_ptr<BookmarkBubbleDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser()));
 
   delegate->OnSignInLinkClicked();
 
   // A new tab should have been opened and the browser should be visible.
   int tab_count = browser()->tab_strip_model()->count();
@@ skipping 74 matching lines @@
   // visible.
   int tab_count = extra_browser->tab_strip_model()->count();
   EXPECT_EQ(starting_tab_count + 1, tab_count);
   EXPECT_LE(1,
             static_cast<BookmarkBubbleSignInDelegateTest::Window*>(
                 extra_window.get())->show_count());
 
   // Required to avoid a crash when the browser is deleted.
   extra_browser->tab_strip_model()->CloseAllTabs();
 }