OLD | NEW |
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 "chrome/browser/content_settings/content_settings_pref_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
24 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
25 #include "chrome/test/base/testing_pref_service.h" | 25 #include "chrome/test/base/testing_pref_service.h" |
26 #include "chrome/test/base/testing_profile.h" | 26 #include "chrome/test/base/testing_profile.h" |
27 #include "content/public/browser/notification_observer.h" | 27 #include "content/public/browser/notification_observer.h" |
28 #include "content/test/test_browser_thread.h" | 28 #include "content/test/test_browser_thread.h" |
29 #include "googleurl/src/gurl.h" | 29 #include "googleurl/src/gurl.h" |
30 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
31 | 31 |
32 using ::testing::_; | 32 using ::testing::_; |
| 33 using content::BrowserThread; |
33 | 34 |
34 namespace { | 35 namespace { |
35 | 36 |
36 void ExpectObsoleteGeolocationSetting( | 37 void ExpectObsoleteGeolocationSetting( |
37 const DictionaryValue& geo_settings_dictionary, | 38 const DictionaryValue& geo_settings_dictionary, |
38 const GURL& primary_origin, | 39 const GURL& primary_origin, |
39 const GURL& secondary_origin, | 40 const GURL& secondary_origin, |
40 ContentSetting expected_setting) { | 41 ContentSetting expected_setting) { |
41 | 42 |
42 DictionaryValue* one_origin_settings; | 43 DictionaryValue* one_origin_settings; |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 DictionaryValue* mutable_settings = update.Get(); | 871 DictionaryValue* mutable_settings = update.Get(); |
871 mutable_settings->SetWithoutPathExpansion("www.example.com,*", | 872 mutable_settings->SetWithoutPathExpansion("www.example.com,*", |
872 new base::DictionaryValue()); | 873 new base::DictionaryValue()); |
873 } | 874 } |
874 EXPECT_TRUE(observer.notification_received()); | 875 EXPECT_TRUE(observer.notification_received()); |
875 | 876 |
876 provider.ShutdownOnUIThread(); | 877 provider.ShutdownOnUIThread(); |
877 } | 878 } |
878 | 879 |
879 } // namespace content_settings | 880 } // namespace content_settings |
OLD | NEW |