chrome/test/base/ui_test_utils.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/test/base/ui_test_utils.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/test/base/testing_profile.cc ('k') | chrome/test/data/webui/history_ui_browsertest.cc » ('j') | no next file with comments »

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 "chrome/test/base/ui_test_utils.h"	5 #include "chrome/test/base/ui_test_utils.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/files/file_path.h"	13 #include "base/files/file_path.h"

14 #include "base/files/file_util.h"	14 #include "base/files/file_util.h"

15 #include "base/macros.h"	15 #include "base/macros.h"

16 #include "base/memory/ref_counted.h"	16 #include "base/memory/ref_counted.h"

17 #include "base/memory/scoped_ptr.h"	17 #include "base/memory/scoped_ptr.h"

18 #include "base/path_service.h"	18 #include "base/path_service.h"

19 #include "base/prefs/pref_service.h"

20 #include "base/strings/stringprintf.h"	19 #include "base/strings/stringprintf.h"

21 #include "base/strings/utf_string_conversions.h"	20 #include "base/strings/utf_string_conversions.h"

22 #include "base/test/test_timeouts.h"	21 #include "base/test/test_timeouts.h"

23 #include "base/time/time.h"	22 #include "base/time/time.h"

24 #include "build/build_config.h"	23 #include "build/build_config.h"

25 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	24 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

26 #include "chrome/browser/chrome_notification_types.h"	25 #include "chrome/browser/chrome_notification_types.h"

27 #include "chrome/browser/history/history_service_factory.h"	26 #include "chrome/browser/history/history_service_factory.h"

28 #include "chrome/browser/profiles/profile.h"	27 #include "chrome/browser/profiles/profile.h"

29 #include "chrome/browser/ui/browser.h"	28 #include "chrome/browser/ui/browser.h"

(...skipping 10 matching lines...) Expand all Loading...
40 #include "chrome/browser/ui/tabs/tab_strip_model.h"	39 #include "chrome/browser/ui/tabs/tab_strip_model.h"

41 #include "chrome/common/chrome_paths.h"	40 #include "chrome/common/chrome_paths.h"

42 #include "chrome/common/pref_names.h"	41 #include "chrome/common/pref_names.h"

43 #include "chrome/test/base/find_in_page_observer.h"	42 #include "chrome/test/base/find_in_page_observer.h"

44 #include "components/app_modal/app_modal_dialog.h"	43 #include "components/app_modal/app_modal_dialog.h"

45 #include "components/app_modal/app_modal_dialog_queue.h"	44 #include "components/app_modal/app_modal_dialog_queue.h"

46 #include "components/bookmarks/browser/bookmark_model.h"	45 #include "components/bookmarks/browser/bookmark_model.h"

47 #include "components/history/core/browser/history_service_observer.h"	46 #include "components/history/core/browser/history_service_observer.h"

48 #include "components/omnibox/browser/autocomplete_controller.h"	47 #include "components/omnibox/browser/autocomplete_controller.h"

49 #include "components/omnibox/browser/omnibox_view.h"	48 #include "components/omnibox/browser/omnibox_view.h"

	49 #include "components/prefs/pref_service.h"

50 #include "content/public/browser/download_item.h"	50 #include "content/public/browser/download_item.h"

51 #include "content/public/browser/download_manager.h"	51 #include "content/public/browser/download_manager.h"

52 #include "content/public/browser/geolocation_provider.h"	52 #include "content/public/browser/geolocation_provider.h"

53 #include "content/public/browser/navigation_controller.h"	53 #include "content/public/browser/navigation_controller.h"

54 #include "content/public/browser/navigation_entry.h"	54 #include "content/public/browser/navigation_entry.h"

55 #include "content/public/browser/notification_service.h"	55 #include "content/public/browser/notification_service.h"

56 #include "content/public/browser/render_process_host.h"	56 #include "content/public/browser/render_process_host.h"

57 #include "content/public/browser/web_contents.h"	57 #include "content/public/browser/web_contents.h"

58 #include "content/public/browser/web_contents_observer.h"	58 #include "content/public/browser/web_contents_observer.h"

59 #include "content/public/common/geoposition.h"	59 #include "content/public/common/geoposition.h"

(...skipping 469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
529 new content::MessageLoopRunner;	529 new content::MessageLoopRunner;

530 WaitHistoryLoadedObserver observer(runner.get());	530 WaitHistoryLoadedObserver observer(runner.get());

531 ScopedObserver<history::HistoryService, history::HistoryServiceObserver>	531 ScopedObserver<history::HistoryService, history::HistoryServiceObserver>

532 scoped_observer(&observer);	532 scoped_observer(&observer);

533 scoped_observer.Add(history_service);	533 scoped_observer.Add(history_service);

534 runner->Run();	534 runner->Run();

535 }	535 }

536 }	536 }

537	537

538 } // namespace ui_test_utils	538 } // namespace ui_test_utils

OLD	NEW