Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Switch ChromeTestSuite to the same convention as ContentTestSuite:

the test suite implicitly provides global resources for each test,
but they're re-initialized between each test.

The performance overhead is negligible.

We need that to continue moving tests from unit_tests
to content_unittests. Because of shared test fixtures
the test suites need to be compatible.

BUG=90443

Review URL: http://codereview.chromium.org/7744039

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser@98526 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 073490bac61c75d67151a1a78ef32084538b70ef 1 parent a46478b
phajdan.jr@chromium.org authored
Showing with 191 additions and 346 deletions.
  1. +0 −3  app_controller_mac_unittest.mm
  2. +0 −1  autocomplete/autocomplete_edit_unittest.cc
  3. +1 −6 autocomplete/autocomplete_unittest.cc
  4. +1 −2  autocomplete/builtin_provider_unittest.cc
  5. +2 −2 autocomplete/extension_app_provider_unittest.cc
  6. +1 −2  autocomplete/history_contents_provider_unittest.cc
  7. +1 −2  autocomplete/history_quick_provider_unittest.cc
  8. +1 −2  autocomplete/history_url_provider_unittest.cc
  9. +1 −2  autocomplete/keyword_provider_unittest.cc
  10. +1 −2  autocomplete/search_provider_unittest.cc
  11. +1 −2  autocomplete/shortcuts_provider_unittest.cc
  12. +0 −1  autocomplete_history_manager_unittest.cc
  13. +1 −2  autofill/address_unittest.cc
  14. +1 −2  autofill/autofill_download_unittest.cc
  15. +1 −2  autofill/autofill_ie_toolbar_import_win_unittest.cc
  16. +1 −2  autofill/autofill_merge_unittest.cc
  17. +1 −2  autofill/autofill_profile_unittest.cc
  18. +1 −2  autofill/credit_card_unittest.cc
  19. +0 −1  autofill/personal_data_manager_unittest.cc
  20. +1 −2  autofill/phone_number_i18n_unittest.cc
  21. +1 −2  autofill/select_control_handler_unittest.cc
  22. +1 −2  automation/automation_provider_unittest.cc
  23. +1 −2  background/background_contents_service_unittest.cc
  24. +1 −2  background/background_mode_manager_unittest.cc
  25. +1 −2  bookmarks/bookmark_codec_unittest.cc
  26. +1 −2  bookmarks/bookmark_context_menu_controller_unittest.cc
  27. +1 −2  bookmarks/bookmark_expanded_state_tracker_unittest.cc
  28. +2 −3 bookmarks/bookmark_html_writer_unittest.cc
  29. +1 −2  bookmarks/bookmark_index_unittest.cc
  30. +3 −4 bookmarks/bookmark_model_unittest.cc
  31. +1 −2  bookmarks/bookmark_node_data_unittest.cc
  32. +1 −2  bookmarks/bookmark_utils_unittest.cc
  33. +1 −2  bookmarks/recently_used_folders_combo_model_unittest.cc
  34. +1 −2  browser_about_handler_unittest.cc
  35. +1 −2  browsing_data_appcache_helper_unittest.cc
  36. +1 −2  browsing_data_cookie_helper_unittest.cc
  37. +1 −2  browsing_data_database_helper_unittest.cc
  38. +1 −2  browsing_data_file_system_helper_unittest.cc
  39. +2 −2 browsing_data_indexed_db_helper_unittest.cc
  40. +1 −2  browsing_data_local_storage_helper_unittest.cc
  41. +1 −2  browsing_data_remover_unittest.cc
  42. +1 −2  chromeos/input_method/input_method_util_unittest.cc
  43. +1 −2  chromeos/login/cookie_fetcher_unittest.cc
  44. +1 −2  chromeos/login/google_authenticator_unittest.cc
  45. +1 −2  chromeos/login/online_attempt_unittest.cc
  46. +1 −2  chromeos/login/owner_manager_unittest.cc
  47. +1 −2  chromeos/login/ownership_service_unittest.cc
  48. +1 −2  chromeos/login/parallel_authenticator_unittest.cc
  49. +1 −2  chromeos/login/signed_settings_helper_unittest.cc
  50. +1 −2  chromeos/login/signed_settings_temp_storage_unittest.cc
  51. +1 −2  chromeos/login/signed_settings_unittest.cc
  52. +0 −1  chromeos/login/user_controller_unittest.cc
  53. +1 −2  chromeos/notifications/desktop_notifications_unittest.h
  54. +0 −1  chromeos/status/input_method_menu_unittest.cc
  55. +1 −2  component_updater/component_updater_service_unittest.cc
  56. +2 −3 content_settings/content_settings_policy_provider_unittest.cc
  57. +2 −3 content_settings/content_settings_pref_provider_unittest.cc
  58. +1 −2  content_settings/host_content_settings_map_unittest.cc
  59. +1 −2  cookies_tree_model_unittest.cc
  60. +1 −2  custom_handlers/protocol_handler_registry_unittest.cc
  61. +1 −2  download/download_manager_unittest.cc
  62. +1 −2  download/download_safe_browsing_client_unittest.cc
  63. +4 −3 extensions/apps_promo_unittest.cc
  64. +1 −2  extensions/extension_bookmarks_unittest.cc
  65. +1 −2  extensions/extension_cookies_unittest.cc
  66. +4 −3 extensions/extension_event_router_forwarder_unittest.cc
  67. +1 −2  extensions/extension_icon_manager_unittest.cc
  68. +1 −2  extensions/extension_menu_manager_unittest.cc
  69. +1 −2  extensions/extension_prefs_unittest.cc
  70. +1 −2  extensions/extension_process_manager_unittest.cc
  71. +0 −2  extensions/extension_service_unittest.cc
  72. +1 −2  extensions/extension_service_unittest.h
  73. +1 −2  extensions/extension_updater_unittest.cc
  74. +1 −3 extensions/extension_webrequest_api_unittest.cc
  75. +1 −2  extensions/external_policy_extension_loader_unittest.cc
  76. +1 −2  extensions/image_loading_tracker_unittest.cc
  77. +1 −2  extensions/user_script_master_unittest.cc
  78. +1 −2  geolocation/geolocation_content_settings_map_unittest.cc
  79. +1 −2  geolocation/geolocation_settings_state_unittest.cc
  80. +7 −5 google/google_url_tracker_unittest.cc
  81. +1 −2  history/expire_history_backend_unittest.cc
  82. +1 −2  history/history_backend_unittest.cc
  83. +1 −2  history/history_querying_unittest.cc
  84. +1 −2  history/history_unittest.cc
  85. +1 −2  history/history_unittest_base.h
  86. +1 −2  importer/importer_unittest.cc
  87. +1 −2  instant/promo_counter_unittest.cc
  88. +0 −1  intents/register_intent_handler_infobar_delegate_unittest.cc
  89. +1 −2  intents/web_intents_registry_unittest.cc
  90. +0 −3  metrics/metrics_service_uitest.cc
  91. +1 −2  net/gaia/gaia_oauth_fetcher_unittest.cc
  92. +1 −2  net/gaia/token_service_unittest.h
  93. +1 −2  notifications/desktop_notifications_unittest.h
  94. +1 −2  password_manager/native_backend_gnome_x_unittest.cc
  95. +1 −2  password_manager/password_form_manager_unittest.cc
  96. +1 −2  password_manager/password_store_default_unittest.cc
  97. +1 −2  password_manager/password_store_win_unittest.cc
  98. +0 −2  password_manager/password_store_x_unittest.cc
  99. +1 −2  plugin_exceptions_table_model_unittest.cc
  100. +0 −2  policy/cloud_policy_subsystem_unittest.cc
  101. +0 −2  policy/device_management_service_unittest.cc
  102. +1 −2  policy/device_policy_cache_unittest.cc
  103. +1 −2  policy/enterprise_metrics_browsertest.cc
  104. +1 −2  policy/user_policy_cache_unittest.cc
  105. +1 −2  prefs/pref_model_associator_unittest.cc
  106. +1 −2  prefs/pref_notifier_impl_unittest.cc
  107. +1 −2  prerender/prerender_manager_unittest.cc
  108. +1 −2  prerender/prerender_tracker_unittest.cc
  109. +1 −2  printing/print_dialog_cloud_unittest.cc
  110. +1 −2  printing/print_job_unittest.cc
  111. +1 −0  printing/print_preview_tab_controller_unittest.cc
  112. +1 −2  profiles/avatar_menu_model_unittest.cc
  113. +6 −3 profiles/profile_info_cache_unittest.cc
  114. +6 −4 profiles/profile_manager_unittest.cc
  115. +1 −2  renderer_host/text_input_client_mac_unittest.mm
  116. +1 −2  renderer_host/web_cache_manager_unittest.cc
  117. +1 −2  safe_browsing/client_side_detection_service_unittest.cc
  118. +1 −2  search_engines/template_url_parser_unittest.cc
  119. +1 −2  search_engines/template_url_prepopulate_data_unittest.cc
  120. +2 −2 search_engines/template_url_service_sync_unittest.cc
  121. +0 −2  search_engines/template_url_service_test_util.h
  122. +1 −2  search_engines/template_url_unittest.cc
  123. +1 −2  sync/abstract_profile_sync_service_test.h
  124. +1 −2  sync/backend_migrator_unittest.cc
  125. +1 −2  sync/glue/autofill_data_type_controller_unittest.cc
  126. +1 −2  sync/glue/bookmark_data_type_controller_unittest.cc
  127. +1 −2  sync/glue/data_type_manager_impl_unittest.cc
  128. +1 −2  sync/glue/extension_data_type_controller_unittest.cc
  129. +1 −2  sync/glue/frontend_data_type_controller_unittest.cc
  130. +1 −2  sync/glue/non_frontend_data_type_controller_unittest.cc
  131. +1 −2  sync/glue/preference_data_type_controller_unittest.cc
  132. +1 −2  sync/glue/sync_backend_host_unittest.cc
  133. +1 −2  sync/glue/sync_backend_registrar_unittest.cc
  134. +1 −2  sync/glue/theme_data_type_controller_unittest.cc
  135. +1 −2  sync/glue/theme_util_unittest.cc
  136. +1 −2  sync/profile_sync_factory_impl_unittest.cc
  137. +1 −2  sync/profile_sync_service_bookmark_unittest.cc
  138. +1 −2  sync/profile_sync_service_startup_unittest.cc
  139. +1 −2  sync/profile_sync_service_unittest.cc
  140. +2 −3 tab_contents/thumbnail_generator_unittest.cc
  141. +5 −7 translate/translate_manager_browsertest.cc
  142. +3 −1 ui/browser_list_unittest.cc
  143. +0 −2  ui/cocoa/browser_test_helper.h
  144. +1 −2  ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
  145. +1 −2  ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
  146. +1 −2  ui/gtk/gtk_theme_service_unittest.cc
  147. +1 −2  ui/intents/intents_model_unittest.cc
  148. +1 −2  ui/search_engines/keyword_editor_controller_unittest.cc
  149. +6 −4 ui/shell_dialogs_unittest.cc
  150. +1 −2  ui/toolbar/encoding_menu_controller_unittest.cc
  151. +1 −2  ui/views/accessibility_event_router_views_unittest.cc
  152. +0 −1  ui/views/bookmarks/bookmark_bar_view_test.cc
  153. +1 −2  ui/views/bookmarks/bookmark_context_menu_test.cc
  154. +1 −2  ui/views/bookmarks/bookmark_editor_view_unittest.cc
  155. +1 −2  ui/views/extensions/browser_action_drag_data_unittest.cc
  156. +0 −3  ui/webui/options/language_options_handler_unittest.cc
  157. +1 −2  ui/webui/theme_source_unittest.cc
  158. +0 −2  user_style_sheet_watcher_unittest.cc
  159. +1 −2  visitedlink/visitedlink_unittest.cc
  160. +4 −3 web_resource/promo_resource_service_unittest.cc
  161. +1 −2  webdata/autofill_table_unittest.cc
  162. +1 −2  webdata/web_data_service_unittest.cc
  163. +1 −2  webdata/web_database_migration_unittest.cc
View
3  app_controller_mac_unittest.mm
@@ -7,12 +7,9 @@
#include "base/memory/scoped_nsobject.h"
#include "chrome/app/chrome_command_ids.h"
#import "chrome/browser/app_controller_mac.h"
-#include "chrome/test/base/testing_browser_process.h"
#include "testing/platform_test.h"
class AppControllerTest : public PlatformTest {
- private:
- ScopedTestingBrowserProcess browser_process_;
};
TEST_F(AppControllerTest, DockMenu) {
View
1  autocomplete/autocomplete_edit_unittest.cc
@@ -135,7 +135,6 @@ TEST(AutocompleteEditTest, AdjustTextForCopy) {
// Tests that we don't get double http if the user manually inserts http.
{ "a.de/", 0, false, "http://a.de/", "http://a.de/", true, "http://a.de/" },
};
- ScopedTestingBrowserProcess browser_process;
TestingOmniboxView view;
TestingAutocompleteEditController controller;
TestingProfile profile;
View
7 autocomplete/autocomplete_unittest.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
@@ -127,8 +126,6 @@ class AutocompleteProviderTest : public testing::Test,
const NotificationSource& source,
const NotificationDetails& details);
- ScopedTestingBrowserProcess browser_process_;
-
MessageLoopForUI message_loop_;
scoped_ptr<AutocompleteController> controller_;
NotificationRegistrar registrar_;
@@ -273,7 +270,7 @@ TEST_F(AutocompleteProviderTest, AllowExactKeywordMatch) {
RunExactKeymatchTest(false);
}
-typedef TestingBrowserProcessTest AutocompleteTest;
+typedef testing::Test AutocompleteTest;
TEST_F(AutocompleteTest, InputType) {
struct test_data {
@@ -464,8 +461,6 @@ TEST(AutocompleteInput, ParseForEmphasizeComponent) {
Component(12, 11), kInvalidComponent }
};
- ScopedTestingBrowserProcess browser_process;
-
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
Component scheme, host;
AutocompleteInput::ParseForEmphasizeComponents(input_cases[i].input,
View
3  autocomplete/builtin_provider_unittest.cc
@@ -8,11 +8,10 @@
#include "chrome/browser/autocomplete/builtin_provider.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BuiltinProviderTest : public TestingBrowserProcessTest {
+class BuiltinProviderTest : public testing::Test {
protected:
template<class ResultType>
struct test_data {
View
4 autocomplete/extension_app_provider_unittest.cc
@@ -5,14 +5,14 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/autocomplete/extension_app_provider.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/url_database.h"
#include "chrome/test/base/testing_profile.h"
+#include "testing/gtest/include/gtest/gtest.h"
-class ExtensionAppProviderTest : public TestingBrowserProcessTest {
+class ExtensionAppProviderTest : public testing::Test {
protected:
struct test_data {
const string16 input;
View
3  autocomplete/history_contents_provider_unittest.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/history/history.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -32,7 +31,7 @@ struct TestEntry {
{"http://www.google.com/3", "PAGETHREE 3", "BAR some hello world for you"},
};
-class HistoryContentsProviderTest : public TestingBrowserProcessTest,
+class HistoryContentsProviderTest : public testing::Test,
public ACProviderListener {
public:
HistoryContentsProviderTest()
View
3  autocomplete/history_quick_provider_unittest.cc
@@ -21,7 +21,6 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -72,7 +71,7 @@ struct TestURLInfo {
"Dogs & Cats & Mice & Other Animals", 1, 1, 0},
};
-class HistoryQuickProviderTest : public TestingBrowserProcessTest,
+class HistoryQuickProviderTest : public testing::Test,
public ACProviderListener {
public:
HistoryQuickProviderTest()
View
3  autocomplete/history_url_provider_unittest.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/history/history.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -98,7 +97,7 @@ struct TestURLInfo {
{"http://p/", "p", 0, 0},
};
-class HistoryURLProviderTest : public TestingBrowserProcessTest,
+class HistoryURLProviderTest : public testing::Test,
public ACProviderListener {
public:
HistoryURLProviderTest()
View
3  autocomplete/keyword_provider_unittest.cc
@@ -9,11 +9,10 @@
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-class KeywordProviderTest : public TestingBrowserProcessTest {
+class KeywordProviderTest : public testing::Test {
protected:
template<class ResultType>
struct test_data {
View
3  autocomplete/search_provider_unittest.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/test/test_url_fetcher_factory.h"
@@ -33,7 +32,7 @@
// . The URL created by using the search term keyword_term_ with keyword_t_url_
// is added to history.
// . test_factory_ is set as the URLFetcher::Factory.
-class SearchProviderTest : public TestingBrowserProcessTest,
+class SearchProviderTest : public testing::Test,
public AutocompleteProvider::ACProviderListener {
public:
SearchProviderTest()
View
3  autocomplete/shortcuts_provider_unittest.cc
@@ -22,7 +22,6 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -95,7 +94,7 @@ struct TestShortcutInfo {
"Test - site", "0,0", 1, 4},
};
-class ShortcutsProviderTest : public TestingBrowserProcessTest,
+class ShortcutsProviderTest : public testing::Test,
public ACProviderListener {
public:
ShortcutsProviderTest();
View
1  autocomplete_history_manager_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/autocomplete_history_manager.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/tab_contents/test_tab_contents.h"
View
3  autofill/address_unittest.cc
@@ -8,10 +8,9 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/address.h"
#include "chrome/browser/autofill/autofill_type.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
-typedef TestingBrowserProcessTest AddressTest;
+typedef testing::Test AddressTest;
// Test that the getters and setters for country code are working.
TEST_F(AddressTest, CountryCode) {
View
3  autofill/autofill_download_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/autofill/form_structure.h"
#include "chrome/test/base/test_url_request_context_getter.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/test/test_url_fetcher_factory.h"
#include "net/url_request/url_request_status.h"
@@ -115,7 +114,7 @@ class AutofillDownloadTestHelper : public AutofillDownloadManager::Observer {
scoped_refptr<net::URLRequestContextGetter> request_context_getter;
};
-typedef TestingBrowserProcessTest AutofillDownloadTest;
+typedef testing::Test AutofillDownloadTest;
TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
MessageLoopForUI message_loop;
View
3  autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/autofill/credit_card.h"
#include "chrome/browser/autofill/field_types.h"
#include "chrome/browser/sync/util/data_encryption.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::win::RegKey;
@@ -108,7 +107,7 @@ void CreateSubkey(RegKey* key, wchar_t const* subkey_name,
} // namespace
-class AutofillIeToolbarImportTest : public TestingBrowserProcessTest {
+class AutofillIeToolbarImportTest : public testing::Test {
public:
AutofillIeToolbarImportTest();
View
3  autofill/autofill_merge_unittest.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/autofill/data_driven_test.h"
#include "chrome/browser/autofill/form_structure.h"
#include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
@@ -113,7 +112,7 @@ const std::vector<AutofillProfile*>& PersonalDataManagerMock::web_profiles()
// corresponding output file is a dump of the saved profiles that result from
// importing the input profiles. The output file format is identical to the
// input format.
-class AutofillMergeTest : public TestingBrowserProcessTest,
+class AutofillMergeTest : public testing::Test,
public DataDrivenTest {
protected:
AutofillMergeTest();
View
3  autofill/autofill_profile_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/autofill/autofill_common_test.h"
#include "chrome/browser/autofill/autofill_profile.h"
#include "chrome/common/guid.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -25,7 +24,7 @@ bool UpdateProfileLabel(AutofillProfile *profile) {
} // namespace
-typedef TestingBrowserProcessTest AutofillProfileTest;
+typedef testing::Test AutofillProfileTest;
// Tests different possibilities for summary string generation.
// Based on existence of first name, last name, and address line 1.
View
3  autofill/credit_card_unittest.cc
@@ -6,7 +6,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_common_test.h"
#include "chrome/browser/autofill/credit_card.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -40,7 +39,7 @@ const char* const kInvalidNumbers[] = {
} // namespace
-typedef TestingBrowserProcessTest CreditCardTest;
+typedef testing::Test CreditCardTest;
// Tests credit card summary string generation. This test simulates a variety
// of different possible summary strings. Variations occur based on the
View
1  autofill/personal_data_manager_unittest.cc
@@ -81,7 +81,6 @@ class PersonalDataManagerTest : public testing::Test {
MessageLoop::current()->Run();
}
- ScopedTestingBrowserProcess browser_process_;
MessageLoopForUI message_loop_;
BrowserThread ui_thread_;
BrowserThread db_thread_;
View
3  autofill/phone_number_i18n_unittest.cc
@@ -4,7 +4,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/phone_number_i18n.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
using autofill_i18n::NormalizePhoneNumber;
@@ -14,7 +13,7 @@ using autofill_i18n::FormatPhone;
using autofill_i18n::ComparePhones;
using autofill_i18n::PhoneNumbersMatch;
-typedef TestingBrowserProcessTest PhoneNumberI18NTest;
+typedef testing::Test PhoneNumberI18NTest;
TEST_F(PhoneNumberI18NTest, NormalizePhoneNumber) {
// "Large" digits.
View
3  autofill/select_control_handler_unittest.cc
@@ -8,11 +8,10 @@
#include "chrome/browser/autofill/autofill_type.h"
#include "chrome/browser/autofill/credit_card.h"
#include "chrome/browser/autofill/select_control_handler.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/form_field.h"
-typedef TestingBrowserProcessTest SelectControlHandlerTest;
+typedef testing::Test SelectControlHandlerTest;
TEST_F(SelectControlHandlerTest, CreditCardMonthExact) {
const char* const kMonthsNumeric[] = {
View
3  automation/automation_provider_unittest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/automation/chrome_frame_automation_provider.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -21,7 +20,7 @@ class MockChromeFrameAutomationProvider
void (const IPC::Message& message)); // NOLINT
};
-typedef TestingBrowserProcessTest AutomationProviderTest;
+typedef testing::Test AutomationProviderTest;
TEST_F(AutomationProviderTest, TestInvalidChromeFrameMessage) {
MessageLoop message_loop;
View
3  background/background_contents_service_unittest.cc
@@ -16,13 +16,12 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
-class BackgroundContentsServiceTest : public TestingBrowserProcessTest {
+class BackgroundContentsServiceTest : public testing::Test {
public:
BackgroundContentsServiceTest() {}
~BackgroundContentsServiceTest() {}
View
3  background/background_mode_manager_unittest.cc
@@ -8,11 +8,10 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BackgroundModeManagerTest : public TestingBrowserProcessTest {
+class BackgroundModeManagerTest : public testing::Test {
public:
BackgroundModeManagerTest() {}
~BackgroundModeManagerTest() {}
View
3  bookmarks/bookmark_codec_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/bookmarks/bookmark_model_test_utils.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/common/json_value_serializer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -38,7 +37,7 @@ BookmarkNode* AsMutable(const BookmarkNode* node) {
} // namespace
-class BookmarkCodecTest : public TestingBrowserProcessTest {
+class BookmarkCodecTest : public testing::Test {
protected:
// Helpers to create bookmark models with different data.
BookmarkModel* CreateTestModel1() {
View
3  bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/browser/tab_contents/page_navigator.h"
@@ -43,7 +42,7 @@ class TestingPageNavigator : public PageNavigator {
std::vector<GURL> urls_;
};
-class BookmarkContextMenuControllerTest : public TestingBrowserProcessTest {
+class BookmarkContextMenuControllerTest : public testing::Test {
public:
BookmarkContextMenuControllerTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
View
3  bookmarks/bookmark_expanded_state_tracker_unittest.cc
@@ -6,12 +6,11 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BookmarkExpandedStateTrackerTest : public TestingBrowserProcessTest {
+class BookmarkExpandedStateTrackerTest : public testing::Test {
public:
BookmarkExpandedStateTrackerTest();
View
5 bookmarks/bookmark_html_writer_unittest.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/importer/firefox2_importer.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "grit/generated_resources.h"
@@ -41,10 +40,10 @@ void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) {
} // namespace
-class BookmarkHTMLWriterTest : public TestingBrowserProcessTest {
+class BookmarkHTMLWriterTest : public testing::Test {
protected:
virtual void SetUp() {
- TestingBrowserProcessTest::SetUp();
+ testing::Test::SetUp();
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
path_ = temp_dir_.path().AppendASCII("bookmarks.html");
}
View
3  bookmarks/bookmark_index_unittest.cc
@@ -15,12 +15,11 @@
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/history/history_database.h"
#include "chrome/browser/history/in_memory_database.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BookmarkIndexTest : public TestingBrowserProcessTest {
+class BookmarkIndexTest : public testing::Test {
public:
BookmarkIndexTest() : model_(new BookmarkModel(NULL)) {}
View
7 bookmarks/bookmark_model_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/model_test_utils.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_details.h"
@@ -52,7 +51,7 @@ void SwapDateAdded(BookmarkNode* n1, BookmarkNode* n2) {
n2->set_date_added(tmp);
}
-class BookmarkModelTest : public TestingBrowserProcessTest,
+class BookmarkModelTest : public testing::Test,
public BookmarkModelObserver {
public:
struct ObserverDetails {
@@ -694,13 +693,13 @@ void PopulateBookmarkNode(TestNode* parent,
}
// Test class that creates a BookmarkModel with a real history backend.
-class BookmarkModelTestWithProfile : public TestingBrowserProcessTest {
+class BookmarkModelTestWithProfile : public testing::Test {
public:
BookmarkModelTestWithProfile()
: ui_thread_(BrowserThread::UI, &message_loop_),
file_thread_(BrowserThread::FILE, &message_loop_) {}
- // TestingBrowserProcessTest:
+ // testing::Test:
virtual void TearDown() OVERRIDE {
profile_.reset(NULL);
}
View
3  bookmarks/bookmark_node_data_unittest.cc
@@ -8,7 +8,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
@@ -16,7 +15,7 @@
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-class BookmarkNodeDataTest : public TestingBrowserProcessTest {
+class BookmarkNodeDataTest : public testing::Test {
public:
BookmarkNodeDataTest()
: ui_thread_(BrowserThread::UI, &loop_),
View
3  bookmarks/bookmark_utils_unittest.cc
@@ -9,14 +9,13 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
#if !defined(OS_MACOSX)
#include "chrome/browser/browser_process.h"
#endif
-typedef TestingBrowserProcessTest BookmarkUtilsTest;
+typedef testing::Test BookmarkUtilsTest;
TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
BookmarkModel model(NULL);
View
3  bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -6,12 +6,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-class RecentlyUsedFoldersComboModelTest : public TestingBrowserProcessTest {
+class RecentlyUsedFoldersComboModelTest : public testing::Test {
public:
RecentlyUsedFoldersComboModelTest();
View
3  browser_about_handler_unittest.cc
@@ -7,13 +7,12 @@
#include "chrome/browser/browser_about_handler.h"
#include "chrome/common/about_handler.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-typedef TestingBrowserProcessTest BrowserAboutHandlerTest;
+typedef testing::Test BrowserAboutHandlerTest;
TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
std::string chrome_prefix(chrome::kChromeUIScheme);
View
3  browsing_data_appcache_helper_unittest.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/browsing_data_appcache_helper.h"
#include "base/stl_util.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -28,7 +27,7 @@ class TestCompletionCallback {
} // namespace
-typedef TestingBrowserProcessTest CannedBrowsingDataAppCacheHelperTest;
+typedef testing::Test CannedBrowsingDataAppCacheHelperTest;
TEST_F(CannedBrowsingDataAppCacheHelperTest, SetInfo) {
TestingProfile profile;
View
3  browsing_data_cookie_helper_unittest.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/message_loop.h"
#include "base/synchronization/waitable_event.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "net/url_request/url_request_context_getter.h"
@@ -16,7 +15,7 @@
namespace {
-class BrowsingDataCookieHelperTest : public TestingBrowserProcessTest {
+class BrowsingDataCookieHelperTest : public testing::Test {
public:
void SetUpOnIOThread(base::WaitableEvent* io_setup_complete) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
View
3  browsing_data_database_helper_unittest.cc
@@ -5,13 +5,12 @@
#include "chrome/browser/browsing_data_database_helper.h"
#include "base/file_util.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-typedef TestingBrowserProcessTest CannedBrowsingDataDatabaseTest;
+typedef testing::Test CannedBrowsingDataDatabaseTest;
TEST_F(CannedBrowsingDataDatabaseTest, Empty) {
TestingProfile profile;
View
3  browsing_data_file_system_helper_unittest.cc
@@ -6,7 +6,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "webkit/fileapi/file_system_context.h"
@@ -46,7 +45,7 @@ typedef scoped_ptr<FileSystemInfoList> ScopedFileSystemInfoList;
// called. For this to work, you'll need to ensure that each async call is
// implemented as a class method that that calls Notify() at an appropriate
// point.
-class BrowsingDataFileSystemHelperTest : public TestingBrowserProcessTest {
+class BrowsingDataFileSystemHelperTest : public testing::Test {
public:
BrowsingDataFileSystemHelperTest()
: helper_(BrowsingDataFileSystemHelper::Create(&profile_)),
View
4 browsing_data_indexed_db_helper_unittest.cc
@@ -6,11 +6,11 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/test/base/testing_browser_process_test.h"
+#include "chrome/test/base/testing_profile.h"
namespace {
-typedef TestingBrowserProcessTest CannedBrowsingDataIndexedDBHelperTest;
+typedef testing::Test CannedBrowsingDataIndexedDBHelperTest;
TEST_F(CannedBrowsingDataIndexedDBHelperTest, Empty) {
const GURL origin("http://host1:1/");
View
3  browsing_data_local_storage_helper_unittest.cc
@@ -4,13 +4,12 @@
#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-typedef TestingBrowserProcessTest CannedBrowsingDataLocalStorageTest;
+typedef testing::Test CannedBrowsingDataLocalStorageTest;
TEST_F(CannedBrowsingDataLocalStorageTest, Empty) {
TestingProfile profile;
View
3  browsing_data_remover_unittest.cc
@@ -10,7 +10,6 @@
#include "base/platform_file.h"
#include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
#include "chrome/browser/history/history.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/fileapi/file_system_context.h"
@@ -151,7 +150,7 @@ class RemoveQuotaManagedDataTester : public BrowsingDataRemoverTester {
// Test Class ----------------------------------------------------------------
-class BrowsingDataRemoverTest : public TestingBrowserProcessTest {
+class BrowsingDataRemoverTest : public testing::Test {
public:
BrowsingDataRemoverTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
View
3  chromeos/input_method/input_method_util_unittest.cc
@@ -8,7 +8,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
@@ -25,7 +24,7 @@ InputMethodDescriptor GetDesc(const std::string& id,
}
} // namespace
-class InputMethodUtilTest : public TestingBrowserProcessTest {
+class InputMethodUtilTest : public testing::Test {
public:
static void SetUpTestCase() {
// Reload the internal maps before running tests, with the stub
View
3  chromeos/login/cookie_fetcher_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/chromeos/login/issue_response_handler.h"
#include "chrome/browser/chromeos/login/mock_auth_response_handler.h"
#include "chrome/common/net/gaia/gaia_urls.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/url_fetcher.h"
@@ -26,7 +25,7 @@ using ::testing::Invoke;
using ::testing::Unused;
using ::testing::_;
-class CookieFetcherTest : public TestingBrowserProcessTest {
+class CookieFetcherTest : public testing::Test {
public:
CookieFetcherTest()
: iat_url_(GaiaUrls::GetInstance()->issue_auth_token_url()),
View
3  chromeos/login/google_authenticator_unittest.cc
@@ -26,7 +26,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
#include "chrome/common/net/gaia/gaia_urls.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/url_fetcher.h"
@@ -51,7 +50,7 @@ using ::testing::_;
namespace chromeos {
-class GoogleAuthenticatorTest : public TestingBrowserProcessTest {
+class GoogleAuthenticatorTest : public testing::Test {
public:
GoogleAuthenticatorTest()
: message_loop_ui_(MessageLoop::TYPE_UI),
View
3  chromeos/login/online_attempt_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/chromeos/login/test_attempt_state.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
@@ -29,7 +28,7 @@ using ::testing::_;
namespace chromeos {
-class OnlineAttemptTest : public TestingBrowserProcessTest {
+class OnlineAttemptTest : public testing::Test {
public:
OnlineAttemptTest()
: message_loop_(MessageLoop::TYPE_UI),
View
3  chromeos/login/owner_manager_unittest.cc
@@ -13,7 +13,6 @@
#include "base/scoped_temp_dir.h"
#include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "crypto/nss_util.h"
#include "crypto/rsa_private_key.h"
@@ -119,7 +118,7 @@ void MockSigner::OnKeyOpComplete(const OwnerManager::KeyOpCode return_code,
////////////////////////////////////////////////////////////////////////////////
// OwnerManagerTest
-class OwnerManagerTest : public TestingBrowserProcessTest {
+class OwnerManagerTest : public testing::Test {
public:
OwnerManagerTest()
: message_loop_(MessageLoop::TYPE_UI),
View
3  chromeos/login/ownership_service_unittest.cc
@@ -13,7 +13,6 @@
#include "base/scoped_temp_dir.h"
#include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
#include "chrome/browser/chromeos/login/owner_manager_unittest.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "crypto/nss_util.h"
#include "crypto/rsa_private_key.h"
@@ -31,7 +30,7 @@ using ::testing::_;
namespace chromeos {
-class OwnershipServiceTest : public TestingBrowserProcessTest {
+class OwnershipServiceTest : public testing::Test {
public:
OwnershipServiceTest()
: message_loop_(MessageLoop::TYPE_UI),
View
3  chromeos/login/parallel_authenticator_unittest.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/chromeos/login/test_attempt_state.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/url_fetcher.h"
@@ -79,7 +78,7 @@ class TestOnlineAttempt : public OnlineAttempt {
}
};
-class ParallelAuthenticatorTest : public TestingBrowserProcessTest {
+class ParallelAuthenticatorTest : public testing::Test {
public:
ParallelAuthenticatorTest()
: message_loop_(MessageLoop::TYPE_UI),
View
3  chromeos/login/signed_settings_helper_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/chromeos/login/signed_settings.h"
#include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
#include "chrome/browser/policy/proto/device_management_backend.pb.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -47,7 +46,7 @@ class MockSignedSettingsHelperCallback : public SignedSettingsHelper::Callback {
const std::string& value));
};
-class SignedSettingsHelperTest : public TestingBrowserProcessTest,
+class SignedSettingsHelperTest : public testing::Test,
public SignedSettingsHelper::TestDelegate {
public:
SignedSettingsHelperTest()
View
3  chromeos/login/signed_settings_temp_storage_unittest.cc
@@ -14,12 +14,11 @@
#include "base/scoped_temp_dir.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/logging_chrome.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
-class SignedSettingsTempStorageTest : public TestingBrowserProcessTest {
+class SignedSettingsTempStorageTest : public testing::Test {
protected:
virtual void SetUp() {
ref_map_["some_stuff"] = "a=35;code=64";
View
3  chromeos/login/signed_settings_unittest.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/chromeos/login/owner_manager_unittest.h"
#include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
#include "chrome/browser/policy/proto/device_management_backend.pb.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "crypto/rsa_private_key.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -99,7 +98,7 @@ class ProtoDelegate : public DummyDelegate<const em::PolicyFetchResponse&> {
} // anonymous namespace
-class SignedSettingsTest : public TestingBrowserProcessTest {
+class SignedSettingsTest : public testing::Test {
public:
SignedSettingsTest()
: fake_email_("fakey@example.com"),
View
1  chromeos/login/user_controller_unittest.cc
@@ -29,7 +29,6 @@ TEST(UserControllerTest, GetNameTooltipExistingUser) {
// We need to have NotificationService and g_browser_process initialized
// before we create UserController for existing user.
// Otherwise we crash with either SEGFAULT or DCHECK.
- ScopedTestingBrowserProcess browser_process;
UserManager::User existing_user;
existing_user.set_email("someordinaryuser@domain.com");
UserController existing_user_controller(NULL, existing_user);
View
3  chromeos/notifications/desktop_notifications_unittest.h
@@ -19,7 +19,6 @@
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/notifications/notifications_prefs_cache.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
@@ -58,7 +57,7 @@ class MockBalloonCollection : public BalloonCollectionImpl {
std::set<Balloon*> balloons_;
};
-class DesktopNotificationsTest : public TestingBrowserProcessTest {
+class DesktopNotificationsTest : public testing::Test {
public:
DesktopNotificationsTest();
virtual ~DesktopNotificationsTest();
View
1  chromeos/status/input_method_menu_unittest.cc
@@ -112,7 +112,6 @@ TEST(InputMethodMenuTest, GetTextForIndicatorTest) {
// Test whether the function returns language name for non-ambiguous languages.
TEST(InputMethodMenuTest, GetTextForMenuTest) {
- ScopedTestingBrowserProcess browser_process;
// For most languages input method or keyboard layout name is returned.
// See below for exceptions.
{
View
3  component_updater/component_updater_service_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/test_notification_tracker.h"
#include "chrome/test/base/test_url_request_context_getter.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_service.h"
@@ -120,7 +119,7 @@ const char header_ok_reply[] =
} // namespace
// Common fixture for all the component updater tests.
-class ComponentUpdaterTest : public TestingBrowserProcessTest {
+class ComponentUpdaterTest : public testing::Test {
public:
ComponentUpdaterTest() : component_updater_(NULL), test_config_(NULL) {
// The component updater instance under test.
View
5 content_settings/content_settings_policy_provider_unittest.cc
@@ -13,7 +13,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
@@ -24,7 +23,7 @@ using ::testing::_;
namespace content_settings {
-class PolicyDefaultProviderTest : public TestingBrowserProcessTest {
+class PolicyDefaultProviderTest : public testing::Test {
public:
PolicyDefaultProviderTest()
: ui_thread_(BrowserThread::UI, &message_loop_) {
@@ -141,7 +140,7 @@ TEST_F(PolicyDefaultProviderTest, AutoSelectCertificate) {
provider.ShutdownOnUIThread();
}
-class PolicyProviderTest : public TestingBrowserProcessTest {
+class PolicyProviderTest : public testing::Test {
public:
PolicyProviderTest()
: ui_thread_(BrowserThread::UI, &message_loop_) {
View
5 content_settings/content_settings_pref_provider_unittest.cc
@@ -17,7 +17,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
@@ -47,7 +46,7 @@ void ExpectObsoleteGeolocationSetting(
namespace content_settings {
-class PrefDefaultProviderTest : public TestingBrowserProcessTest {
+class PrefDefaultProviderTest : public testing::Test {
public:
PrefDefaultProviderTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
@@ -216,7 +215,7 @@ bool SettingsEqual(const ContentSettings& settings1,
return true;
}
-class PrefProviderTest : public TestingBrowserProcessTest {
+class PrefProviderTest : public testing::Test {
public:
PrefProviderTest() : ui_thread_(
BrowserThread::UI, &message_loop_) {
View
3  content_settings/host_content_settings_map_unittest.cc
@@ -14,7 +14,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "googleurl/src/gurl.h"
@@ -40,7 +39,7 @@ bool SettingsEqual(const ContentSettings& settings1,
} // namespace
-class HostContentSettingsMapTest : public TestingBrowserProcessTest {
+class HostContentSettingsMapTest : public testing::Test {
public:
HostContentSettingsMapTest() : ui_thread_(BrowserThread::UI, &message_loop_) {
}
View
3  cookies_tree_model_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
#include "chrome/browser/mock_browsing_data_quota_helper.h"
#include "chrome/browser/mock_browsing_data_local_storage_helper.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/common/content_notification_types.h"
#include "content/common/notification_details.h"
@@ -29,7 +28,7 @@ using ::testing::_;
namespace {
-class CookiesTreeModelTest : public TestingBrowserProcessTest {
+class CookiesTreeModelTest : public testing::Test {
public:
CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_),
io_thread_(BrowserThread::IO, &message_loop_) {
View
3  custom_handlers/protocol_handler_registry_unittest.cc
@@ -13,7 +13,6 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/custom_handlers/protocol_handler.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
@@ -187,7 +186,7 @@ class QueryProtocolHandlerOnChange : public NotificationObserver {
NotificationRegistrar notification_registrar_;
};
-class ProtocolHandlerRegistryTest : public TestingBrowserProcessTest {
+class ProtocolHandlerRegistryTest : public testing::Test {
protected:
ProtocolHandlerRegistryTest()
: test_protocol_handler_(CreateProtocolHandler("test", "test")) {}
View
3  download/download_manager_unittest.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/browser/download/download_create_info.h"
@@ -37,7 +36,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/text/bytes_formatting.h"
-class DownloadManagerTest : public TestingBrowserProcessTest {
+class DownloadManagerTest : public testing::Test {
public:
static const char* kTestData;
static const size_t kTestDataLen;
View
3  download/download_safe_browsing_client_unittest.cc
@@ -5,7 +5,6 @@
#include "base/message_loop.h"
#include "chrome/browser/download/download_safe_browsing_client.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -32,7 +31,7 @@ class MockSafeBrowsingService : public SafeBrowsingService {
} // namespace
-class DownloadSBClientTest : public TestingBrowserProcessTest {
+class DownloadSBClientTest : public testing::Test {
public:
DownloadSBClientTest() :
ui_thread_(BrowserThread::UI, &loop_) {
View
7 extensions/apps_promo_unittest.cc
@@ -3,12 +3,13 @@
// found in the LICENSE file.
#include "base/logging.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_pref_service.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -42,7 +43,7 @@ void ExpectAppsPromoHidden(PrefService* prefs) {
} // namespace
-class ExtensionAppsPromo : public TestingBrowserProcessTest {
+class ExtensionAppsPromo : public testing::Test {
public:
TestingPrefService* prefs() { return &prefs_; }
AppsPromo* apps_promo() { return &apps_promo_; }
@@ -60,7 +61,7 @@ class ExtensionAppsPromo : public TestingBrowserProcessTest {
};
ExtensionAppsPromo::ExtensionAppsPromo()
- : local_state_(testing_browser_process_.get()),
+ : local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)),
apps_promo_(&prefs_) {
}
View
3  extensions/extension_bookmarks_unittest.cc
@@ -9,11 +9,10 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/extensions/extension_bookmark_helpers.h"
#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
namespace keys = extension_bookmarks_module_constants;
-class ExtensionBookmarksTest : public TestingBrowserProcessTest {
+class ExtensionBookmarksTest : public testing::Test {
public:
virtual void SetUp() {
model_.reset(new BookmarkModel(NULL));
View
3  extensions/extension_cookies_unittest.cc
@@ -10,7 +10,6 @@
#include "base/values.h"
#include "chrome/browser/extensions/extension_cookies_api_constants.h"
#include "chrome/browser/extensions/extension_cookies_helpers.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "googleurl/src/gurl.h"
@@ -62,7 +61,7 @@ class OtrTestingProfile : public TestingProfile {
} // namespace
-class ExtensionCookiesTest : public TestingBrowserProcessTest {
+class ExtensionCookiesTest : public testing::Test {
};
TEST_F(ExtensionCookiesTest, StoreIdProfileConversion) {
View
7 extensions/extension_event_router_forwarder_unittest.cc
@@ -8,7 +8,7 @@
#include "base/system_monitor/system_monitor.h"
#include "base/test/thread_test_helper.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/test/base/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
@@ -32,7 +32,7 @@ class MockExtensionEventRouterForwarder : public ExtensionEventRouterForwarder {
} // namespace
-class ExtensionEventRouterForwarderTest : public TestingBrowserProcessTest {
+class ExtensionEventRouterForwarderTest : public testing::Test {
protected:
ExtensionEventRouterForwarderTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
@@ -50,7 +50,8 @@ class ExtensionEventRouterForwarderTest : public TestingBrowserProcessTest {
// Inject a BrowserProcess with a ProfileManager.
ASSERT_TRUE(io_thread_.Start());
- TestingBrowserProcess* browser_process = testing_browser_process_.get();
+ TestingBrowserProcess* browser_process =
+ static_cast<TestingBrowserProcess*>(g_browser_process);
browser_process->SetProfileManager(new ProfileManager);
profile1_ = new TestingProfile();
View
3  extensions/extension_icon_manager_unittest.cc
@@ -9,7 +9,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_resource.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/common/json_value_serializer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -17,7 +16,7 @@
// Our test class that takes care of managing the necessary threads for loading
// extension icons, and waiting for those loads to happen.
-class ExtensionIconManagerTest : public TestingBrowserProcessTest {
+class ExtensionIconManagerTest : public testing::Test {
public:
ExtensionIconManagerTest() :
unwaited_image_loads_(0),
View
3  extensions/extension_menu_manager_unittest.cc
@@ -17,7 +17,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
@@ -31,7 +30,7 @@ using testing::Return;
using testing::SaveArg;
// Base class for tests.
-class ExtensionMenuManagerTest : public TestingBrowserProcessTest {
+class ExtensionMenuManagerTest : public testing::Test {
public:
ExtensionMenuManagerTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
View
3  extensions/extension_prefs_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_permission_set.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_details.h"
#include "content/common/notification_observer_mock.h"
@@ -46,7 +45,7 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
}
// Base class for tests.
-class ExtensionPrefsTest : public TestingBrowserProcessTest {
+class ExtensionPrefsTest : public testing::Test {
public:
ExtensionPrefsTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
View
3  extensions/extension_process_manager_unittest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/site_instance.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -13,7 +12,7 @@
namespace {
// make the test a PlatformTest to setup autorelease pools properly on mac
-class ExtensionProcessManagerTest : public TestingBrowserProcessTest {
+class ExtensionProcessManagerTest : public testing::Test {
public:
static void SetUpTestCase() {
ExtensionErrorReporter::Init(false); // no noisy errors
View
2  extensions/extension_service_unittest.cc
@@ -3306,8 +3306,6 @@ class ExtensionsReadyRecorder : public NotificationObserver {
// Also tests that we always fire EXTENSIONS_READY, no matter whether we are
// enabled or not.
TEST(ExtensionServiceTestSimple, Enabledness) {
- ScopedTestingBrowserProcess browser_process;
-
ExtensionErrorReporter::Init(false); // no noisy errors
ExtensionsReadyRecorder recorder;
scoped_ptr<TestingProfile> profile(new TestingProfile());
View
3  extensions/extension_service_unittest.h
@@ -12,11 +12,10 @@
#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-class ExtensionServiceTestBase : public TestingBrowserProcessTest {
+class ExtensionServiceTestBase : public testing::Test {
public:
ExtensionServiceTestBase();
virtual ~ExtensionServiceTestBase();
View
3  extensions/extension_updater_unittest.cc
@@ -25,7 +25,6 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/test/test_url_fetcher_factory.h"
@@ -287,7 +286,7 @@ static void ExtractParameters(const std::string& params,
// All of our tests that need to use private APIs of ExtensionUpdater live
// inside this class (which is a friend to ExtensionUpdater).
-class ExtensionUpdaterTest : public TestingBrowserProcessTest {
+class ExtensionUpdaterTest : public testing::Test {
public:
static void SimulateTimerFired(ExtensionUpdater* updater) {
EXPECT_TRUE(updater->timer_.IsRunning());
View
4 extensions/extension_webrequest_api_unittest.cc
@@ -15,7 +15,6 @@
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/common/json_value_serializer.h"
@@ -78,7 +77,7 @@ class TestIPCSender : public IPC::Message::Sender {
SentMessages sent_messages_;
};
-class ExtensionWebRequestTest : public TestingBrowserProcessTest {
+class ExtensionWebRequestTest : public testing::Test {
protected:
virtual void SetUp() {
event_router_ = new ExtensionEventRouterForwarder();
@@ -335,7 +334,6 @@ class ExtensionWebRequestHeaderModificationTest :
context_->set_network_delegate(network_delegate_.get());
}
- ScopedTestingBrowserProcess browser_process_;
MessageLoopForIO io_loop_;
TestingProfile profile_;
TestDelegate delegate_;
View
3  extensions/external_policy_extension_loader_unittest.cc
@@ -13,13 +13,12 @@
#include "chrome/browser/extensions/external_policy_extension_loader.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_pref_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-class ExternalPolicyExtensionProviderTest : public TestingBrowserProcessTest {
+class ExternalPolicyExtensionProviderTest : public testing::Test {
public:
ExternalPolicyExtensionProviderTest()
: loop_(MessageLoop::TYPE_IO),
View
3  extensions/image_loading_tracker_unittest.cc
@@ -10,7 +10,6 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/extension_resource.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/common/json_value_serializer.h"
#include "content/common/notification_service.h"
@@ -18,7 +17,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/size.h"
-class ImageLoadingTrackerTest : public TestingBrowserProcessTest,
+class ImageLoadingTrackerTest : public testing::Test,
public ImageLoadingTracker::Observer {
public:
ImageLoadingTrackerTest()
View
3  extensions/user_script_master_unittest.cc
@@ -13,7 +13,6 @@
#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_registrar.h"
@@ -32,7 +31,7 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
// Test bringing up a master on a specific directory, putting a script
// in there, etc.
-class UserScriptMasterTest : public TestingBrowserProcessTest,
+class UserScriptMasterTest : public testing::Test,
public NotificationObserver {
public:
UserScriptMasterTest()
View
3  geolocation/geolocation_content_settings_map_unittest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_registrar.h"
@@ -60,7 +59,7 @@ void MockGeolocationSettingsObserver::Observe(
GURL("http://foo.random-hostname.com/"));
}
-class GeolocationContentSettingsMapTests : public TestingBrowserProcessTest {
+class GeolocationContentSettingsMapTests : public testing::Test {
public:
GeolocationContentSettingsMapTests()
: ui_thread_(BrowserThread::UI, &message_loop_) {
View
3  geolocation/geolocation_settings_state_unittest.cc
@@ -6,7 +6,6 @@
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/geolocation/geolocation_settings_state.h"
-#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/browser/tab_contents/navigation_details.h"
@@ -15,7 +14,7 @@
namespace {
-class GeolocationSettingsStateTests : public TestingBrowserProcessTest {
+class GeolocationSettingsStateTests : public testing::Test {
public:
GeolocationSettingsStateTests()
: ui_thread_(BrowserThread::UI, &message_loop_) {
View
12 google/google_url_tracker_unittest.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_pref_service.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
@@ -100,7 +100,7 @@ InfoBarDelegate* CreateTestInfobar(
// GoogleURLTrackerTest -------------------------------------------------------
-class GoogleURLTrackerTest : public TestingBrowserProcessTest {
+class GoogleURLTrackerTest : public testing::Test {
protected:
GoogleURLTrackerTest();
virtual ~GoogleURLTrackerTest();
@@ -144,7 +144,7 @@ GoogleURLTrackerTest::GoogleURLTrackerTest()
: observer_(new TestNotificationObserver),
message_loop_(MessageLoop::TYPE_IO),
io_thread_(BrowserThread::IO, &message_loop_),
- local_state_(testing_browser_process_.get()) {
+ local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)) {
}
GoogleURLTrackerTest::~GoogleURLTrackerTest() {
@@ -155,14 +155,16 @@ void GoogleURLTrackerTest::SetUp() {
GoogleURLTracker* tracker = new GoogleURLTracker;
tracker->queue_wakeup_task_ = false;
MessageLoop::current()->RunAllPending();
- testing_browser_process_.get()->SetGoogleURLTracker(tracker);
+ static_cast<TestingBrowserProcess*>(g_browser_process)->SetGoogleURLTracker(
+ tracker);
g_browser_process->google_url_tracker()->infobar_creator_ =
&CreateTestInfobar;
}
void GoogleURLTrackerTest::TearDown() {
- testing_browser_process_.get()->SetGoogleURLTracker(NULL);
+ static_cast<TestingBrowserProcess*>(g_browser_process)->SetGoogleURLTracker(
+ NULL);
network_change_notifier_.reset();
}
View
3  history/expire_history_backend_unittest.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/history/top_sites.h"
#include "chrome/common/chrome_notification_types.h"