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

Unified Diff: chrome/browser/profiles/profile_loader_unittest.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix silly compile error 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/profiles/profile_loader_unittest.cc
diff --git a/chrome/browser/profiles/profile_loader_unittest.cc b/chrome/browser/profiles/profile_loader_unittest.cc
index 6637ab94897b0e1b3a5d7e471804d00fd1134c32..b77111bb9b3e79c0c55e0d9c55563060919005dc 100644
--- a/chrome/browser/profiles/profile_loader_unittest.cc
+++ b/chrome/browser/profiles/profile_loader_unittest.cc
@@ -13,9 +13,15 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_loader.h"
#include "chrome/test/base/testing_profile.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(OS_CHROMEOS)
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#endif // defined(OS_CHROMEOS)
+
namespace {
using ::testing::_;
@@ -69,7 +75,21 @@ class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
MockCallback::MockCallback() {}
MockCallback::~MockCallback() {}
-TEST(ProfileLoaderTest, LoadProfileInvalidatingOtherLoads) {
+class ProfileLoaderTest : public testing::Test {
+ protected:
+ static void SetUpTestCase() {
+#if defined(OS_CHROMEOS)
+ // Needed to handle http://crbug.com/119175.
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kDisableZeroBrowsersOpenForTests);
+#endif // defined(OS_CHROMEOS)
+ }
+
+ private:
+ content::TestBrowserThreadBundle thread_bundle_;
+};
+
+TEST_F(ProfileLoaderTest, LoadProfileInvalidatingOtherLoads) {
TestingProfile profile;
base::FilePath fake_profile_path_1 =
base::FilePath::FromUTF8Unsafe("fake/profile 1");

Powered by Google App Engine
This is Rietveld 408576698