chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc - Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merged ToT Created 7 years, 6 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

« no previous file with comments | « chrome/browser/translate/translate_manager_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

index 30f0869a389d82e985c7ce730193ea53becb5fad..eedb1e6ad9360b2a2202f0e52bebb9473091ee3a 100644

--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc

@@ -19,7 +19,6 @@

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

#include "content/public/browser/web_contents.h"

-#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/aura/client/activation_change_observer.h"

@@ -133,10 +132,6 @@ class TabHelperTabStripModelDelegate : public TestTabStripModelDelegate {

class LauncherItemControllerPerAppTest

: public ChromeRenderViewHostTestHarness {

public:

- LauncherItemControllerPerAppTest()

- : browser_thread_(content::BrowserThread::UI, &message_loop_) {

- }

virtual void SetUp() OVERRIDE {

ChromeRenderViewHostTestHarness::SetUp();

@@ -241,11 +236,6 @@ class LauncherItemControllerPerAppTest

AppIconLoaderImpl* app_icon_loader_;

scoped_ptr<aura::test::TestActivationClient> activation_client_;

- private:

- content::TestBrowserThread browser_thread_;

- DISALLOW_COPY_AND_ASSIGN(LauncherItemControllerPerAppTest);

};

// Verify that the launcher item positions are persisted and restored.

@@ -318,8 +308,6 @@ class BrowserLauncherItemControllerTest

virtual void TearDown() OVERRIDE {

LauncherItemControllerPerAppTest::TearDown();

}

- DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemControllerTest);

};

// Verifies a new launcher item is added for TYPE_TABBED.