| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/strings/string_number_conversions.h" | 6 #include "base/strings/string_number_conversions.h" |
| 7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" | 10 #include "chrome/browser/extensions/dev_mode_bubble_controller.h" |
| (...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 const base::Time& time, | 834 const base::Time& time, |
| 835 ExtensionPrefs* prefs) { | 835 ExtensionPrefs* prefs) { |
| 836 std::string time_str = base::Int64ToString(time.ToInternalValue()); | 836 std::string time_str = base::Int64ToString(time.ToInternalValue()); |
| 837 prefs->UpdateExtensionPref(extension_id, | 837 prefs->UpdateExtensionPref(extension_id, |
| 838 "install_time", | 838 "install_time", |
| 839 new base::StringValue(time_str)); | 839 new base::StringValue(time_str)); |
| 840 } | 840 } |
| 841 | 841 |
| 842 // The feature this is meant to test is only implemented on Windows. | 842 // The feature this is meant to test is only implemented on Windows. |
| 843 #if defined(OS_WIN) | 843 #if defined(OS_WIN) |
| 844 #define MAYBE_ProxyOverriddenControllerTest ProxyOverriddenControllerTest | 844 // http://crbug.com/397426 |
| 845 #define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTe
st |
| 845 #else | 846 #else |
| 846 #define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTe
st | 847 #define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTe
st |
| 847 #endif | 848 #endif |
| 848 | 849 |
| 849 TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) { | 850 TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) { |
| 850 Init(); | 851 Init(); |
| 851 ExtensionPrefs* prefs = ExtensionPrefs::Get(profile()); | 852 ExtensionPrefs* prefs = ExtensionPrefs::Get(profile()); |
| 852 // Load two extensions overriding proxy and one overriding something | 853 // Load two extensions overriding proxy and one overriding something |
| 853 // unrelated (to check for interference). Extension 2 should still win | 854 // unrelated (to check for interference). Extension 2 should still win |
| 854 // on the proxy setting. | 855 // on the proxy setting. |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 // Clean up after ourselves. | 948 // Clean up after ourselves. |
| 948 service_->UninstallExtension( | 949 service_->UninstallExtension( |
| 949 kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); | 950 kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); |
| 950 service_->UninstallExtension( | 951 service_->UninstallExtension( |
| 951 kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); | 952 kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); |
| 952 service_->UninstallExtension( | 953 service_->UninstallExtension( |
| 953 kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); | 954 kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL); |
| 954 } | 955 } |
| 955 | 956 |
| 956 } // namespace extensions | 957 } // namespace extensions |
| OLD | NEW |