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

Unified Diff: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android webview init fix merged in. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc
index c7f78591d571d0f943002e3ff8da0e0fd62616c1..a1c98f2221edfb9a73e78a85855ba899b1242e44 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/platform_test.h"
#include "ui/base/gtk/gtk_hig_constants.h"
@@ -42,11 +42,9 @@ class OmniboxEditControllerMock : public OmniboxEditController {
class OmniboxViewGtkTest : public PlatformTest {
public:
- OmniboxViewGtkTest() : file_thread_(content::BrowserThread::UI) {}
-
virtual void SetUp() {
PlatformTest::SetUp();
- profile_.reset(new TestingProfile);
+ profile_.reset(new TestingProfile());
window_ = gtk_window_new(GTK_WINDOW_POPUP);
controller_.reset(new OmniboxEditControllerMock);
view_.reset(new OmniboxViewGtk(controller_.get(), NULL, profile_.get(),
@@ -64,15 +62,12 @@ class OmniboxViewGtkTest : public PlatformTest {
view_->paste_clipboard_requested_ = b;
}
+ content::TestBrowserThreadBundle thread_bundle_;
scoped_ptr<OmniboxEditControllerMock> controller_;
scoped_ptr<TestingProfile> profile_;
GtkTextBuffer* text_buffer_;
scoped_ptr<OmniboxViewGtk> view_;
GtkWidget* window_;
- content::TestBrowserThread file_thread_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtkTest);
};
TEST_F(OmniboxViewGtkTest, InsertText) {
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service_unittest.cc ('k') | chrome/browser/ui/omnibox/omnibox_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698