| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "content/public/browser/notification_service.h" | 38 #include "content/public/browser/notification_service.h" |
| 39 #include "content/public/common/page_transition_types.h" | 39 #include "content/public/common/page_transition_types.h" |
| 40 #include "content/public/test/browser_test_utils.h" | 40 #include "content/public/test/browser_test_utils.h" |
| 41 #include "content/public/test/test_navigation_observer.h" | 41 #include "content/public/test/test_navigation_observer.h" |
| 42 #include "content/public/test/test_utils.h" | 42 #include "content/public/test/test_utils.h" |
| 43 #include "extensions/browser/extension_registry.h" | 43 #include "extensions/browser/extension_registry.h" |
| 44 #include "extensions/browser/extension_system.h" | 44 #include "extensions/browser/extension_system.h" |
| 45 #include "extensions/common/extension.h" | 45 #include "extensions/common/extension.h" |
| 46 | 46 |
| 47 #if defined(OS_CHROMEOS) | 47 #if defined(OS_CHROMEOS) |
| 48 #include "chrome/browser/chromeos/login/users/user_manager.h" | |
| 49 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 48 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 50 #include "chromeos/chromeos_switches.h" | 49 #include "chromeos/chromeos_switches.h" |
| 50 #include "components/user_manager/user_manager.h" |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 #if defined(OS_MACOSX) | 53 #if defined(OS_MACOSX) |
| 54 #include "base/mac/scoped_nsautorelease_pool.h" | 54 #include "base/mac/scoped_nsautorelease_pool.h" |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 using extensions::Extension; | 57 using extensions::Extension; |
| 58 | 58 |
| 59 namespace performance_monitor { | 59 namespace performance_monitor { |
| 60 | 60 |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 CHECK(base::CopyFile(stock_prefs_file, second_profile_prefs_file)); | 352 CHECK(base::CopyFile(stock_prefs_file, second_profile_prefs_file)); |
| 353 CHECK(base::PathExists(second_profile_prefs_file)); | 353 CHECK(base::PathExists(second_profile_prefs_file)); |
| 354 | 354 |
| 355 return true; | 355 return true; |
| 356 } | 356 } |
| 357 | 357 |
| 358 #if defined(OS_CHROMEOS) | 358 #if defined(OS_CHROMEOS) |
| 359 virtual void AddSecondUserAccount() { | 359 virtual void AddSecondUserAccount() { |
| 360 // Add second user account for multi-profile test. | 360 // Add second user account for multi-profile test. |
| 361 if (GetParam()) { | 361 if (GetParam()) { |
| 362 chromeos::UserManager::Get()->UserLoggedIn(kSecondProfileAccount, | 362 user_manager::UserManager::Get()->UserLoggedIn( |
| 363 kSecondProfileHash, | 363 kSecondProfileAccount, kSecondProfileHash, false); |
| 364 false); | |
| 365 } | 364 } |
| 366 } | 365 } |
| 367 #endif | 366 #endif |
| 368 | 367 |
| 369 protected: | 368 protected: |
| 370 std::string first_profile_name_; | 369 std::string first_profile_name_; |
| 371 std::string second_profile_name_; | 370 std::string second_profile_name_; |
| 372 }; | 371 }; |
| 373 | 372 |
| 374 class PerformanceMonitorSessionRestoreBrowserTest | 373 class PerformanceMonitorSessionRestoreBrowserTest |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 metrics = GetStats(METRIC_NETWORK_BYTES_READ); | 833 metrics = GetStats(METRIC_NETWORK_BYTES_READ); |
| 835 ASSERT_EQ(2u, metrics.size()); | 834 ASSERT_EQ(2u, metrics.size()); |
| 836 EXPECT_GE(metrics[1].value, page1_size + page2_size); | 835 EXPECT_GE(metrics[1].value, page1_size + page2_size); |
| 837 } | 836 } |
| 838 | 837 |
| 839 INSTANTIATE_TEST_CASE_P(PerformanceMonitorUncleanExitBrowserTestInstantiation, | 838 INSTANTIATE_TEST_CASE_P(PerformanceMonitorUncleanExitBrowserTestInstantiation, |
| 840 PerformanceMonitorUncleanExitBrowserTest, | 839 PerformanceMonitorUncleanExitBrowserTest, |
| 841 testing::Bool()); | 840 testing::Bool()); |
| 842 | 841 |
| 843 } // namespace performance_monitor | 842 } // namespace performance_monitor |
| OLD | NEW |