chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc - Issue 17127002: Correctly integrate StoragePartition into TestingProfile.

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/chrome_launcher_controller_per_browser_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix InstantNTP test. Created 7 years, 5 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/tab_contents/spelling_menu_observer_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/chrome_launcher_controller_per_browser_unittest.cc

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

index 5d73e33690205db2ccf1b5411f55b3b81177aaa7..f91430bbcd41b6d94bcc0e59d300ad9031a49780 100644

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

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

@@ -13,7 +13,7 @@

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

#include "base/memory/scoped_ptr.h"

-#include "base/message_loop/message_loop.h"

+#include "base/run_loop.h"

#include "base/values.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/test_extension_system.h"

@@ -23,7 +23,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/test/base/testing_pref_service_syncable.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/gtest/include/gtest/gtest.h"

#if defined(OS_CHROMEOS)

@@ -38,9 +38,7 @@ using extensions::Manifest;

class ChromeLauncherControllerPerBrowserTest : public testing::Test {

protected:

ChromeLauncherControllerPerBrowserTest()

- : ui_thread_(content::BrowserThread::UI, &loop_),

- file_thread_(content::BrowserThread::FILE, &loop_),

- profile_(new TestingProfile()),

+ : profile_(new TestingProfile()),

extension_service_(NULL) {

DictionaryValue manifest;

manifest.SetString("name", "launcher controller test extension");

@@ -81,7 +79,7 @@ class ChromeLauncherControllerPerBrowserTest : public testing::Test {

virtual void TearDown() OVERRIDE {

profile_.reset();

// Execute any pending deletion tasks.

- loop_.RunUntilIdle();

+ base::RunLoop().RunUntilIdle();

}

void InsertPrefValue(base::ListValue* pref_value,

@@ -145,9 +143,7 @@ class ChromeLauncherControllerPerBrowserTest : public testing::Test {

}

// Needed for extension service & friends to work.

- base::MessageLoop loop_;

- content::TestBrowserThread ui_thread_;

- content::TestBrowserThread file_thread_;

+ content::TestBrowserThreadBundle thread_bundle_;

#if defined OS_CHROMEOS

chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;