chrome/browser/performance_monitor/performance_monitor_browsertest.cc - Issue 18644007: Update some includes of chrome_notification_types.h

Side by Side Diff: chrome/browser/performance_monitor/performance_monitor_browsertest.cc

Issue 18644007: Update some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix deps Created 7 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/performance_monitor/performance_monitor.cc ('k') | chrome/browser/performance_monitor/startup_timer.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 "base/command_line.h"	5 #include "base/command_line.h"

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

7 #include "base/logging.h"	7 #include "base/logging.h"

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

9 #include "base/strings/string_number_conversions.h"	9 #include "base/strings/string_number_conversions.h"

10 #include "base/threading/sequenced_worker_pool.h"	10 #include "base/threading/sequenced_worker_pool.h"

11 #include "chrome/browser/browser_process.h"	11 #include "chrome/browser/browser_process.h"

	12 #include "chrome/browser/chrome_notification_types.h"

12 #include "chrome/browser/extensions/extension_browsertest.h"	13 #include "chrome/browser/extensions/extension_browsertest.h"

13 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

14 #include "chrome/browser/performance_monitor/constants.h"	15 #include "chrome/browser/performance_monitor/constants.h"

15 #include "chrome/browser/performance_monitor/database.h"	16 #include "chrome/browser/performance_monitor/database.h"

16 #include "chrome/browser/performance_monitor/metric.h"	17 #include "chrome/browser/performance_monitor/metric.h"

17 #include "chrome/browser/performance_monitor/performance_monitor.h"	18 #include "chrome/browser/performance_monitor/performance_monitor.h"

18 #include "chrome/browser/prefs/session_startup_pref.h"	19 #include "chrome/browser/prefs/session_startup_pref.h"

19 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

21 #include "chrome/browser/sessions/session_service.h"	22 #include "chrome/browser/sessions/session_service.h"

22 #include "chrome/browser/sessions/session_service_factory.h"	23 #include "chrome/browser/sessions/session_service_factory.h"

23 #include "chrome/browser/sessions/session_service_test_helper.h"	24 #include "chrome/browser/sessions/session_service_test_helper.h"

24 #include "chrome/browser/ui/browser.h"	25 #include "chrome/browser/ui/browser.h"

25 #include "chrome/browser/ui/browser_commands.h"	26 #include "chrome/browser/ui/browser_commands.h"

26 #include "chrome/browser/ui/browser_navigator.h"	27 #include "chrome/browser/ui/browser_navigator.h"

27 #include "chrome/browser/ui/browser_window.h"	28 #include "chrome/browser/ui/browser_window.h"

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

29 #include "chrome/browser/ui/tabs/tab_strip_model.h"	30 #include "chrome/browser/ui/tabs/tab_strip_model.h"

30 #include "chrome/common/chrome_constants.h"	31 #include "chrome/common/chrome_constants.h"

31 #include "chrome/common/chrome_notification_types.h"

32 #include "chrome/common/chrome_paths.h"	32 #include "chrome/common/chrome_paths.h"

33 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/chrome_version_info.h"	34 #include "chrome/common/chrome_version_info.h"

35 #include "chrome/common/extensions/extension.h"	35 #include "chrome/common/extensions/extension.h"

36 #include "chrome/common/url_constants.h"	36 #include "chrome/common/url_constants.h"

37 #include "chrome/test/base/ui_test_utils.h"	37 #include "chrome/test/base/ui_test_utils.h"

38 #include "content/public/browser/notification_registrar.h"	38 #include "content/public/browser/notification_registrar.h"

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

40 #include "content/public/common/page_transition_types.h"	40 #include "content/public/common/page_transition_types.h"

41 #include "content/public/test/browser_test_utils.h"	41 #include "content/public/test/browser_test_utils.h"

(...skipping 748 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
790 test_server()->GetURL(std::string("files/").append("title2.html")));	790 test_server()->GetURL(std::string("files/").append("title2.html")));

791	791

792 performance_monitor()->DoTimedCollections();	792 performance_monitor()->DoTimedCollections();

793	793

794 metrics = GetStats(METRIC_NETWORK_BYTES_READ);	794 metrics = GetStats(METRIC_NETWORK_BYTES_READ);

795 ASSERT_EQ(2u, metrics.size());	795 ASSERT_EQ(2u, metrics.size());

796 EXPECT_GE(metrics[1].value, page1_size + page2_size);	796 EXPECT_GE(metrics[1].value, page1_size + page2_size);

797 }	797 }

798	798

799 } // namespace performance_monitor	799 } // namespace performance_monitor

OLD	NEW