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 <algorithm> | 5 #include <algorithm> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "chrome/app/chrome_command_ids.h" | 28 #include "chrome/app/chrome_command_ids.h" |
29 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 29 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
30 #include "chrome/browser/background/background_contents_service.h" | 30 #include "chrome/browser/background/background_contents_service.h" |
31 #include "chrome/browser/browser_process.h" | 31 #include "chrome/browser/browser_process.h" |
32 #include "chrome/browser/chrome_notification_types.h" | 32 #include "chrome/browser/chrome_notification_types.h" |
33 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 33 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
34 #include "chrome/browser/devtools/devtools_window.h" | 34 #include "chrome/browser/devtools/devtools_window.h" |
35 #include "chrome/browser/download/download_prefs.h" | 35 #include "chrome/browser/download/download_prefs.h" |
36 #include "chrome/browser/extensions/crx_installer.h" | 36 #include "chrome/browser/extensions/crx_installer.h" |
37 #include "chrome/browser/extensions/extension_host.h" | 37 #include "chrome/browser/extensions/extension_host.h" |
38 #include "chrome/browser/extensions/extension_process_manager.h" | |
39 #include "chrome/browser/extensions/extension_service.h" | 38 #include "chrome/browser/extensions/extension_service.h" |
40 #include "chrome/browser/extensions/extension_system.h" | 39 #include "chrome/browser/extensions/extension_system.h" |
41 #include "chrome/browser/extensions/unpacked_installer.h" | 40 #include "chrome/browser/extensions/unpacked_installer.h" |
42 #include "chrome/browser/extensions/updater/extension_updater.h" | 41 #include "chrome/browser/extensions/updater/extension_updater.h" |
43 #include "chrome/browser/infobars/infobar_service.h" | 42 #include "chrome/browser/infobars/infobar_service.h" |
44 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 43 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
45 #include "chrome/browser/media/media_stream_devices_controller.h" | 44 #include "chrome/browser/media/media_stream_devices_controller.h" |
46 #include "chrome/browser/metrics/variations/variations_service.h" | 45 #include "chrome/browser/metrics/variations/variations_service.h" |
47 #include "chrome/browser/net/url_request_mock_util.h" | 46 #include "chrome/browser/net/url_request_mock_util.h" |
48 #include "chrome/browser/plugins/plugin_prefs.h" | 47 #include "chrome/browser/plugins/plugin_prefs.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 #include "content/public/common/result_codes.h" | 106 #include "content/public/common/result_codes.h" |
108 #include "content/public/common/url_constants.h" | 107 #include "content/public/common/url_constants.h" |
109 #include "content/public/common/webplugininfo.h" | 108 #include "content/public/common/webplugininfo.h" |
110 #include "content/public/test/browser_test_utils.h" | 109 #include "content/public/test/browser_test_utils.h" |
111 #include "content/public/test/download_test_observer.h" | 110 #include "content/public/test/download_test_observer.h" |
112 #include "content/public/test/mock_notification_observer.h" | 111 #include "content/public/test/mock_notification_observer.h" |
113 #include "content/public/test/test_navigation_observer.h" | 112 #include "content/public/test/test_navigation_observer.h" |
114 #include "content/public/test/test_utils.h" | 113 #include "content/public/test/test_utils.h" |
115 #include "content/test/net/url_request_failed_job.h" | 114 #include "content/test/net/url_request_failed_job.h" |
116 #include "content/test/net/url_request_mock_http_job.h" | 115 #include "content/test/net/url_request_mock_http_job.h" |
| 116 #include "extensions/browser/process_manager.h" |
117 #include "extensions/common/constants.h" | 117 #include "extensions/common/constants.h" |
118 #include "grit/generated_resources.h" | 118 #include "grit/generated_resources.h" |
119 #include "net/base/net_errors.h" | 119 #include "net/base/net_errors.h" |
120 #include "net/base/net_util.h" | 120 #include "net/base/net_util.h" |
121 #include "net/base/url_util.h" | 121 #include "net/base/url_util.h" |
122 #include "net/http/http_stream_factory.h" | 122 #include "net/http/http_stream_factory.h" |
123 #include "net/url_request/url_request.h" | 123 #include "net/url_request/url_request.h" |
124 #include "net/url_request/url_request_filter.h" | 124 #include "net/url_request/url_request_filter.h" |
125 #include "policy/policy_constants.h" | 125 #include "policy/policy_constants.h" |
126 #include "testing/gmock/include/gmock/gmock.h" | 126 #include "testing/gmock/include/gmock/gmock.h" |
(...skipping 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 ASSERT_TRUE(new_version->IsValid()); | 1548 ASSERT_TRUE(new_version->IsValid()); |
1549 base::Version old_version(old_version_number); | 1549 base::Version old_version(old_version_number); |
1550 ASSERT_TRUE(old_version.IsValid()); | 1550 ASSERT_TRUE(old_version.IsValid()); |
1551 | 1551 |
1552 EXPECT_EQ(1, new_version->CompareTo(old_version)); | 1552 EXPECT_EQ(1, new_version->CompareTo(old_version)); |
1553 | 1553 |
1554 EXPECT_EQ(0u, interceptor.GetPendingSize()); | 1554 EXPECT_EQ(0u, interceptor.GetPendingSize()); |
1555 | 1555 |
1556 // Wait until any background pages belonging to force-installed extensions | 1556 // Wait until any background pages belonging to force-installed extensions |
1557 // have been loaded. | 1557 // have been loaded. |
1558 ExtensionProcessManager* manager = | 1558 extensions::ProcessManager* manager = |
1559 extensions::ExtensionSystem::Get(browser()->profile())->process_manager(); | 1559 extensions::ExtensionSystem::Get(browser()->profile())->process_manager(); |
1560 ExtensionProcessManager::ViewSet all_views = manager->GetAllViews(); | 1560 extensions::ProcessManager::ViewSet all_views = manager->GetAllViews(); |
1561 for (ExtensionProcessManager::ViewSet::const_iterator iter = | 1561 for (extensions::ProcessManager::ViewSet::const_iterator iter = |
1562 all_views.begin(); | 1562 all_views.begin(); |
1563 iter != all_views.end();) { | 1563 iter != all_views.end();) { |
1564 if (!(*iter)->IsLoading()) { | 1564 if (!(*iter)->IsLoading()) { |
1565 ++iter; | 1565 ++iter; |
1566 } else { | 1566 } else { |
1567 content::WebContents* web_contents = | 1567 content::WebContents* web_contents = |
1568 content::WebContents::FromRenderViewHost(*iter); | 1568 content::WebContents::FromRenderViewHost(*iter); |
1569 ASSERT_TRUE(web_contents); | 1569 ASSERT_TRUE(web_contents); |
1570 WebContentsLoadedOrDestroyedWatcher(web_contents).Wait(); | 1570 WebContentsLoadedOrDestroyedWatcher(web_contents).Wait(); |
1571 | 1571 |
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2832 chrome_variations::VariationsService::GetVariationsServerURL( | 2832 chrome_variations::VariationsService::GetVariationsServerURL( |
2833 g_browser_process->local_state()); | 2833 g_browser_process->local_state()); |
2834 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true)); | 2834 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true)); |
2835 std::string value; | 2835 std::string value; |
2836 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value)); | 2836 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value)); |
2837 EXPECT_EQ("restricted", value); | 2837 EXPECT_EQ("restricted", value); |
2838 } | 2838 } |
2839 #endif | 2839 #endif |
2840 | 2840 |
2841 } // namespace policy | 2841 } // namespace policy |
OLD | NEW |