| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // Tests the MetricsService stat recording to make sure that the numbers are | 5 // Tests the MetricsService stat recording to make sure that the numbers are |
| 6 // what we expect. | 6 // what we expect. |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(page2_path))); | 50 ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(page2_path))); |
| 51 } | 51 } |
| 52 | 52 |
| 53 // Get a PrefService whose contents correspond to the Local State file | 53 // Get a PrefService whose contents correspond to the Local State file |
| 54 // that was saved by the app as it closed. The caller takes ownership of the | 54 // that was saved by the app as it closed. The caller takes ownership of the |
| 55 // returned PrefService object. | 55 // returned PrefService object. |
| 56 PrefService* GetLocalState() { | 56 PrefService* GetLocalState() { |
| 57 FilePath path = user_data_dir().Append(chrome::kLocalStateFilename); | 57 FilePath path = user_data_dir().Append(chrome::kLocalStateFilename); |
| 58 return PrefServiceMockBuilder().WithUserFilePrefs(path).Create(); | 58 return PrefServiceMockBuilder().WithUserFilePrefs(path).Create(); |
| 59 } | 59 } |
| 60 #if defined(OS_WIN) | 60 #if defined(OS_WIN) || defined(OS_LINUX) |
| 61 // This is not really Windows-specific, the transition is just being done | 61 // This is not really Windows-specific, the transition is just being done |
| 62 // in stages, and Windows is first. See below for more info. | 62 // in stages, and Windows is first. See below for more info. |
| 63 // TODO(phajdan.jr): Remove #ifdef after fixing http://crbug.com/61062. | 63 // TODO(phajdan.jr): Remove #ifdef after fixing http://crbug.com/61062. |
| 64 private: | 64 private: |
| 65 NotificationService notification_service_; | 65 NotificationService notification_service_; |
| 66 #endif | 66 #endif |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 #if defined(OS_MACOSX) | 69 #if defined(OS_MACOSX) |
| 70 // Flaky across all Mac bots: http://crbug.com/92635 | 70 // Flaky across all Mac bots: http://crbug.com/92635 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly)); | 133 EXPECT_TRUE(local_state->GetBoolean(prefs::kStabilityExitedCleanly)); |
| 134 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount)); | 134 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityLaunchCount)); |
| 135 #if defined(TOUCH_UI) | 135 #if defined(TOUCH_UI) |
| 136 // The keyboard page loads for touchui. | 136 // The keyboard page loads for touchui. |
| 137 EXPECT_EQ(5, local_state->GetInteger(prefs::kStabilityPageLoadCount)); | 137 EXPECT_EQ(5, local_state->GetInteger(prefs::kStabilityPageLoadCount)); |
| 138 #else | 138 #else |
| 139 EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount)); | 139 EXPECT_EQ(4, local_state->GetInteger(prefs::kStabilityPageLoadCount)); |
| 140 #endif | 140 #endif |
| 141 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount)); | 141 EXPECT_EQ(1, local_state->GetInteger(prefs::kStabilityRendererCrashCount)); |
| 142 } | 142 } |
| OLD | NEW |