| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "base/prefs/scoped_user_pref_update.h" | 7 #include "base/prefs/scoped_user_pref_update.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/extensions/extension_service_unittest.h" | 10 #include "chrome/browser/extensions/extension_service_unittest.h" |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 ManagedUserServiceFactory::GetForProfile(profile_.get())->Init(); | 180 ManagedUserServiceFactory::GetForProfile(profile_.get())->Init(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 protected: | 183 protected: |
| 184 ScopedVector<ManagedModeSiteList> GetActiveSiteLists( | 184 ScopedVector<ManagedModeSiteList> GetActiveSiteLists( |
| 185 ManagedUserService* managed_user_service) { | 185 ManagedUserService* managed_user_service) { |
| 186 return managed_user_service->GetActiveSiteLists(); | 186 return managed_user_service->GetActiveSiteLists(); |
| 187 } | 187 } |
| 188 | 188 |
| 189 scoped_refptr<extensions::Extension> MakeThemeExtension() { | 189 scoped_refptr<extensions::Extension> MakeThemeExtension() { |
| 190 scoped_ptr<DictionaryValue> source(new DictionaryValue()); | 190 scoped_ptr<base::DictionaryValue> source(new base::DictionaryValue()); |
| 191 source->SetString(extensions::manifest_keys::kName, "Theme"); | 191 source->SetString(extensions::manifest_keys::kName, "Theme"); |
| 192 source->Set(extensions::manifest_keys::kTheme, new DictionaryValue()); | 192 source->Set(extensions::manifest_keys::kTheme, new base::DictionaryValue()); |
| 193 source->SetString(extensions::manifest_keys::kVersion, "1.0"); | 193 source->SetString(extensions::manifest_keys::kVersion, "1.0"); |
| 194 extensions::ExtensionBuilder builder; | 194 extensions::ExtensionBuilder builder; |
| 195 scoped_refptr<extensions::Extension> extension = | 195 scoped_refptr<extensions::Extension> extension = |
| 196 builder.SetManifest(source.Pass()).Build(); | 196 builder.SetManifest(source.Pass()).Build(); |
| 197 return extension; | 197 return extension; |
| 198 } | 198 } |
| 199 | 199 |
| 200 scoped_refptr<extensions::Extension> MakeExtension() { | 200 scoped_refptr<extensions::Extension> MakeExtension() { |
| 201 scoped_ptr<DictionaryValue> manifest = extensions::DictionaryBuilder() | 201 scoped_ptr<base::DictionaryValue> manifest = extensions::DictionaryBuilder() |
| 202 .Set(extensions::manifest_keys::kName, "Extension") | 202 .Set(extensions::manifest_keys::kName, "Extension") |
| 203 .Set(extensions::manifest_keys::kVersion, "1.0") | 203 .Set(extensions::manifest_keys::kVersion, "1.0") |
| 204 .Build(); | 204 .Build(); |
| 205 extensions::ExtensionBuilder builder; | 205 extensions::ExtensionBuilder builder; |
| 206 scoped_refptr<extensions::Extension> extension = | 206 scoped_refptr<extensions::Extension> extension = |
| 207 builder.SetManifest(manifest.Pass()).Build(); | 207 builder.SetManifest(manifest.Pass()).Build(); |
| 208 return extension; | 208 return extension; |
| 209 } | 209 } |
| 210 | 210 |
| 211 bool is_managed_; | 211 bool is_managed_; |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 site_lists[0]->GetSites(&sites); | 390 site_lists[0]->GetSites(&sites); |
| 391 ASSERT_EQ(1u, sites.size()); | 391 ASSERT_EQ(1u, sites.size()); |
| 392 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name); | 392 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name); |
| 393 | 393 |
| 394 EXPECT_EQ(ManagedModeURLFilter::WARN, | 394 EXPECT_EQ(ManagedModeURLFilter::WARN, |
| 395 url_filter->GetFilteringBehaviorForURL(example_url)); | 395 url_filter->GetFilteringBehaviorForURL(example_url)); |
| 396 EXPECT_EQ(ManagedModeURLFilter::ALLOW, | 396 EXPECT_EQ(ManagedModeURLFilter::ALLOW, |
| 397 url_filter->GetFilteringBehaviorForURL(moose_url)); | 397 url_filter->GetFilteringBehaviorForURL(moose_url)); |
| 398 } | 398 } |
| 399 #endif // !defined(OS_ANDROID) | 399 #endif // !defined(OS_ANDROID) |
| OLD | NEW |