Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc

Issue 7465041: GTTF: Use a fresh TestingBrowserProcess for each test, part #4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: should work Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h" 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
6 6
7 #include "base/task.h" 7 #include "base/task.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" 11 #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h"
12 #include "chrome/test/testing_browser_process_test.h"
12 #include "chrome/test/testing_profile.h" 13 #include "chrome/test/testing_profile.h"
13 #include "content/browser/browser_thread.h" 14 #include "content/browser/browser_thread.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 16
16 // Dummy implementation that's good enough for the tests; we don't test 17 // Dummy implementation that's good enough for the tests; we don't test
17 // rendering here so all we need is a non-NULL object. 18 // rendering here so all we need is a non-NULL object.
18 class EmptyTabstripOriginProvider : public TabstripOriginProvider { 19 class EmptyTabstripOriginProvider : public TabstripOriginProvider {
19 public: 20 public:
20 virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) { 21 virtual gfx::Point GetTabStripOriginForWidget(GtkWidget* widget) {
21 return gfx::Point(0, 0); 22 return gfx::Point(0, 0);
22 } 23 }
23 }; 24 };
24 25
25 class BookmarkBarGtkUnittest : public ::testing::Test { 26 class BookmarkBarGtkUnittest : public TestingBrowserProcessTest {
26 protected: 27 protected:
27 BookmarkBarGtkUnittest() 28 BookmarkBarGtkUnittest()
28 : ui_thread_(BrowserThread::UI, &message_loop_), 29 : ui_thread_(BrowserThread::UI, &message_loop_),
29 file_thread_(BrowserThread::FILE, &message_loop_) { 30 file_thread_(BrowserThread::FILE, &message_loop_) {
30 } 31 }
31 32
32 virtual void SetUp() { 33 virtual void SetUp() {
33 profile_.reset(new TestingProfile()); 34 profile_.reset(new TestingProfile());
34 profile_->CreateBookmarkModel(true); 35 profile_->CreateBookmarkModel(true);
35 profile_->BlockUntilBookmarkModelLoaded(); 36 profile_->BlockUntilBookmarkModelLoaded();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ASCIIToUTF16("other"), GURL("http://two.com")); 90 ASCIIToUTF16("other"), GURL("http://two.com"));
90 91
91 bookmark_bar_->Loaded(model, false); 92 bookmark_bar_->Loaded(model, false);
92 93
93 // We should expect two children to the bookmark bar's toolbar. 94 // We should expect two children to the bookmark bar's toolbar.
94 GList* children = gtk_container_get_children( 95 GList* children = gtk_container_get_children(
95 GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get())); 96 GTK_CONTAINER(bookmark_bar_->bookmark_toolbar_.get()));
96 EXPECT_EQ(2U, g_list_length(children)); 97 EXPECT_EQ(2U, g_list_length(children));
97 g_list_free(children); 98 g_list_free(children);
98 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698