| OLD | NEW |
| 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/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/content_settings/cookie_settings.h" | 9 #include "chrome/browser/content_settings/cookie_settings.h" |
| 10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" | 10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 } | 27 } |
| 28 | 28 |
| 29 } // namespace | 29 } // namespace |
| 30 | 30 |
| 31 namespace extensions { | 31 namespace extensions { |
| 32 | 32 |
| 33 class ExtensionContentSettingsApiTest : public ExtensionApiTest { | 33 class ExtensionContentSettingsApiTest : public ExtensionApiTest { |
| 34 public: | 34 public: |
| 35 ExtensionContentSettingsApiTest() : profile_(NULL) {} | 35 ExtensionContentSettingsApiTest() : profile_(NULL) {} |
| 36 | 36 |
| 37 void SetUpCommandLine(CommandLine* command_line) override { | 37 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 38 ExtensionApiTest::SetUpCommandLine(command_line); | 38 ExtensionApiTest::SetUpCommandLine(command_line); |
| 39 command_line->AppendSwitch(switches::kDisablePluginsDiscovery); | 39 command_line->AppendSwitch(switches::kDisablePluginsDiscovery); |
| 40 } | 40 } |
| 41 | 41 |
| 42 void SetUpOnMainThread() override { | 42 void SetUpOnMainThread() override { |
| 43 ExtensionApiTest::SetUpOnMainThread(); | 43 ExtensionApiTest::SetUpOnMainThread(); |
| 44 | 44 |
| 45 // The browser might get closed later (and therefore be destroyed), so we | 45 // The browser might get closed later (and therefore be destroyed), so we |
| 46 // save the profile. | 46 // save the profile. |
| 47 profile_ = browser()->profile(); | 47 profile_ = browser()->profile(); |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 base::FilePath(kBarPath), | 228 base::FilePath(kBarPath), |
| 229 base::ASCIIToUTF16("2.3.4"), | 229 base::ASCIIToUTF16("2.3.4"), |
| 230 base::ASCIIToUTF16("bar")), | 230 base::ASCIIToUTF16("bar")), |
| 231 false); | 231 false); |
| 232 | 232 |
| 233 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) | 233 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) |
| 234 << message_; | 234 << message_; |
| 235 } | 235 } |
| 236 | 236 |
| 237 } // namespace extensions | 237 } // namespace extensions |
| OLD | NEW |