Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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
OLDNEW
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"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_commands.h" 26 #include "chrome/browser/ui/browser_commands.h"
27 #include "chrome/browser/ui/browser_navigator.h" 27 #include "chrome/browser/ui/browser_navigator.h"
28 #include "chrome/browser/ui/browser_window.h" 28 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/browser/ui/host_desktop.h" 29 #include "chrome/browser/ui/host_desktop.h"
30 #include "chrome/browser/ui/tabs/tab_strip_model.h" 30 #include "chrome/browser/ui/tabs/tab_strip_model.h"
31 #include "chrome/common/chrome_constants.h" 31 #include "chrome/common/chrome_constants.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"
36 #include "chrome/common/url_constants.h" 35 #include "chrome/common/url_constants.h"
37 #include "chrome/test/base/ui_test_utils.h" 36 #include "chrome/test/base/ui_test_utils.h"
38 #include "content/public/browser/notification_registrar.h" 37 #include "content/public/browser/notification_registrar.h"
39 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
40 #include "content/public/common/page_transition_types.h" 39 #include "content/public/common/page_transition_types.h"
41 #include "content/public/test/browser_test_utils.h" 40 #include "content/public/test/browser_test_utils.h"
42 #include "content/public/test/test_navigation_observer.h" 41 #include "content/public/test/test_navigation_observer.h"
43 #include "content/public/test/test_utils.h" 42 #include "content/public/test/test_utils.h"
43 #include "extensions/common/extension.h"
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "chromeos/chromeos_switches.h" 46 #include "chromeos/chromeos_switches.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 #include "base/mac/scoped_nsautorelease_pool.h" 50 #include "base/mac/scoped_nsautorelease_pool.h"
51 #endif 51 #endif
52 52
53 using extensions::Extension; 53 using extensions::Extension;
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 test_server()->GetURL(std::string("files/").append("title2.html"))); 785 test_server()->GetURL(std::string("files/").append("title2.html")));
786 786
787 GatherStatistics(); 787 GatherStatistics();
788 788
789 metrics = GetStats(METRIC_NETWORK_BYTES_READ); 789 metrics = GetStats(METRIC_NETWORK_BYTES_READ);
790 ASSERT_EQ(2u, metrics.size()); 790 ASSERT_EQ(2u, metrics.size());
791 EXPECT_GE(metrics[1].value, page1_size + page2_size); 791 EXPECT_GE(metrics[1].value, page1_size + page2_size);
792 } 792 }
793 793
794 } // namespace performance_monitor 794 } // namespace performance_monitor
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698