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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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 unified diff | Download patch | Annotate | Revision Log
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.h" 6 #include "base/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"
(...skipping 11 matching lines...) Expand all
22 public: 22 public:
23 DefaultProviderTest() 23 DefaultProviderTest()
24 : ui_thread_(BrowserThread::UI, &message_loop_), 24 : ui_thread_(BrowserThread::UI, &message_loop_),
25 provider_(profile_.GetPrefs(), false) { 25 provider_(profile_.GetPrefs(), false) {
26 } 26 }
27 virtual ~DefaultProviderTest() { 27 virtual ~DefaultProviderTest() {
28 provider_.ShutdownOnUIThread(); 28 provider_.ShutdownOnUIThread();
29 } 29 }
30 30
31 protected: 31 protected:
32 MessageLoop message_loop_; 32 base::MessageLoop message_loop_;
33 content::TestBrowserThread ui_thread_; 33 content::TestBrowserThread ui_thread_;
34 TestingProfile profile_; 34 TestingProfile profile_;
35 content_settings::DefaultProvider provider_; 35 content_settings::DefaultProvider provider_;
36 }; 36 };
37 37
38 TEST_F(DefaultProviderTest, DefaultValues) { 38 TEST_F(DefaultProviderTest, DefaultValues) {
39 // Check setting defaults. 39 // Check setting defaults.
40 EXPECT_EQ(CONTENT_SETTING_ALLOW, 40 EXPECT_EQ(CONTENT_SETTING_ALLOW,
41 GetContentSetting(&provider_, 41 GetContentSetting(&provider_,
42 GURL(), 42 GURL(),
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 EXPECT_EQ(CONTENT_SETTING_BLOCK, 251 EXPECT_EQ(CONTENT_SETTING_BLOCK,
252 GetContentSetting(&otr_provider, 252 GetContentSetting(&otr_provider,
253 GURL(), 253 GURL(),
254 GURL(), 254 GURL(),
255 CONTENT_SETTINGS_TYPE_COOKIES, 255 CONTENT_SETTINGS_TYPE_COOKIES,
256 std::string(), 256 std::string(),
257 true)); 257 true));
258 otr_provider.ShutdownOnUIThread(); 258 otr_provider.ShutdownOnUIThread();
259 } 259 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698