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

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

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 "chrome/browser/content_settings/content_settings_default_provider.h" 7 #include "chrome/browser/content_settings/content_settings_default_provider.h"
8 #include "chrome/browser/content_settings/content_settings_mock_observer.h" 8 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
9 #include "chrome/browser/content_settings/content_settings_utils.h" 9 #include "chrome/browser/content_settings/content_settings_utils.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "chrome/test/base/testing_pref_service.h" 12 #include "chrome/test/base/testing_pref_service.h"
13 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "content/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using ::testing::_; 18 using ::testing::_;
19 using content::BrowserThread; 19 using content::BrowserThread;
20 20
21 class DefaultProviderTest : public testing::Test { 21 class DefaultProviderTest : public testing::Test {
22 public: 22 public:
23 DefaultProviderTest() 23 DefaultProviderTest()
24 : ui_thread_(BrowserThread::UI, &message_loop_), 24 : ui_thread_(BrowserThread::UI, &message_loop_),
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 EXPECT_EQ(CONTENT_SETTING_ALLOW, 304 EXPECT_EQ(CONTENT_SETTING_ALLOW,
305 GetContentSetting(&provider, 305 GetContentSetting(&provider,
306 GURL(), 306 GURL(),
307 GURL(), 307 GURL(),
308 CONTENT_SETTINGS_TYPE_GEOLOCATION, 308 CONTENT_SETTINGS_TYPE_GEOLOCATION,
309 std::string(), 309 std::string(),
310 false)); 310 false));
311 provider.ShutdownOnUIThread(); 311 provider.ShutdownOnUIThread();
312 } 312 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698