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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/content_settings/cookie_settings.h" 7 #include "chrome/browser/content_settings/cookie_settings.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" 9 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "webkit/plugins/npapi/mock_plugin_list.h" 15 #include "webkit/plugins/npapi/mock_plugin_list.h"
16 16
17 namespace extensions { 17 namespace extensions {
18 18
19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) { 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
20 CommandLine::ForCurrentProcess()->AppendSwitch( 20 CommandLine::ForCurrentProcess()->AppendSwitch(
21 switches::kEnableExperimentalExtensionApis); 21 switches::kEnableExperimentalExtensionApis);
22 22
23 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_; 23 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;
24 24
25 HostContentSettingsMap* map = 25 HostContentSettingsMap* map =
26 browser()->profile()->GetHostContentSettingsMap(); 26 browser()->profile()->GetHostContentSettingsMap();
27 CookieSettings* cookie_settings = 27 CookieSettings* cookie_settings =
28 CookieSettings::Factory::GetForProfile(browser()->profile()); 28 CookieSettings::Factory::GetForProfile(browser()->profile()).get();
29 29
30 // Check default content settings by using an unknown URL. 30 // Check default content settings by using an unknown URL.
31 GURL example_url("http://www.example.com"); 31 GURL example_url("http://www.example.com");
32 EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed( 32 EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(
33 example_url, example_url)); 33 example_url, example_url));
34 EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed( 34 EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed(
35 example_url, example_url)); 35 example_url, example_url));
36 EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url)); 36 EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(example_url));
37 EXPECT_EQ(CONTENT_SETTING_ALLOW, 37 EXPECT_EQ(CONTENT_SETTING_ALLOW,
38 map->GetContentSetting(example_url, 38 map->GetContentSetting(example_url,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 SetPluginsForTesting(&plugins); 126 SetPluginsForTesting(&plugins);
127 127
128 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) 128 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
129 << message_; 129 << message_;
130 130
131 ContentSettingsContentSettingGetResourceIdentifiersFunction:: 131 ContentSettingsContentSettingGetResourceIdentifiersFunction::
132 SetPluginsForTesting(NULL); 132 SetPluginsForTesting(NULL);
133 } 133 }
134 134
135 } // namespace extensions 135 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698