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

Side by Side Diff: chrome/browser/content_settings/content_settings_default_provider_unittest.cc

Issue 615083004: Use ThreadChecker rather than DCHECK_CURRENTLY_ON. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DCHECK testing_profile Created 6 years, 2 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
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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/prefs/testing_pref_service.h" 8 #include "base/prefs/testing_pref_service.h"
9 #include "chrome/browser/content_settings/content_settings_default_provider.h" 9 #include "chrome/browser/content_settings/content_settings_default_provider.h"
10 #include "chrome/browser/content_settings/content_settings_mock_observer.h" 10 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
11 #include "chrome/browser/content_settings/content_settings_utils.h" 11 #include "chrome/browser/content_settings/content_settings_utils.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "content/public/test/test_browser_thread.h"
15 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
16 #include "url/gurl.h" 15 #include "url/gurl.h"
17 16
18 using ::testing::_; 17 using ::testing::_;
19 using content::BrowserThread;
20 18
21 class DefaultProviderTest : public testing::Test { 19 class DefaultProviderTest : public testing::Test {
22 public: 20 public:
23 DefaultProviderTest() 21 DefaultProviderTest()
24 : ui_thread_(BrowserThread::UI, &message_loop_), 22 : provider_(profile_.GetPrefs(), false) {
25 provider_(profile_.GetPrefs(), false) {
26 } 23 }
27 virtual ~DefaultProviderTest() { 24 virtual ~DefaultProviderTest() {
28 provider_.ShutdownOnUIThread(); 25 provider_.ShutdownOnUIThread();
29 } 26 }
30 27
31 protected: 28 protected:
32 base::MessageLoop message_loop_;
33 content::TestBrowserThread ui_thread_;
34 TestingProfile profile_; 29 TestingProfile profile_;
35 content_settings::DefaultProvider provider_; 30 content_settings::DefaultProvider provider_;
36 }; 31 };
37 32
38 TEST_F(DefaultProviderTest, DefaultValues) { 33 TEST_F(DefaultProviderTest, DefaultValues) {
39 // Check setting defaults. 34 // Check setting defaults.
40 EXPECT_EQ(CONTENT_SETTING_ALLOW, 35 EXPECT_EQ(CONTENT_SETTING_ALLOW,
41 GetContentSetting(&provider_, 36 GetContentSetting(&provider_,
42 GURL(), 37 GURL(),
43 GURL(), 38 GURL(),
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 245
251 EXPECT_EQ(CONTENT_SETTING_BLOCK, 246 EXPECT_EQ(CONTENT_SETTING_BLOCK,
252 GetContentSetting(&otr_provider, 247 GetContentSetting(&otr_provider,
253 GURL(), 248 GURL(),
254 GURL(), 249 GURL(),
255 CONTENT_SETTINGS_TYPE_COOKIES, 250 CONTENT_SETTINGS_TYPE_COOKIES,
256 std::string(), 251 std::string(),
257 true)); 252 true));
258 otr_provider.ShutdownOnUIThread(); 253 otr_provider.ShutdownOnUIThread();
259 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698