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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
854 #if !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD) | 854 #if !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD) |
855 // Each profile should have one session restore bubble shown, so we should | 855 // Each profile should have one session restore bubble shown, so we should |
856 // observe count 3 in bucket 0 (which represents bubble shown). | 856 // observe count 3 in bucket 0 (which represents bubble shown). |
857 histogram_tester.ExpectBucketCount("SessionCrashed.Bubble", 0, 3); | 857 histogram_tester.ExpectBucketCount("SessionCrashed.Bubble", 0, 3); |
858 #endif // !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD) | 858 #endif // !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD) |
859 } | 859 } |
860 | 860 |
861 class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest { | 861 class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest { |
862 protected: | 862 protected: |
863 void SetUpCommandLine(base::CommandLine* command_line) override { | 863 void SetUpCommandLine(base::CommandLine* command_line) override { |
864 InProcessBrowserTest::SetUpCommandLine(command_line); | |
865 command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf"); | 864 command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf"); |
866 } | 865 } |
867 }; | 866 }; |
868 | 867 |
869 IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest, | 868 IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest, |
870 StartupSupervisedUserProfile) { | 869 StartupSupervisedUserProfile) { |
871 StartupBrowserCreator browser_creator; | 870 StartupBrowserCreator browser_creator; |
872 | 871 |
873 // Do a simple non-process-startup browser launch. | 872 // Do a simple non-process-startup browser launch. |
874 base::CommandLine dummy(base::CommandLine::NO_PROGRAM); | 873 base::CommandLine dummy(base::CommandLine::NO_PROGRAM); |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1173 } | 1172 } |
1174 #endif // defined(OS_WIN) | 1173 #endif // defined(OS_WIN) |
1175 | 1174 |
1176 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorWelcomeBackTest, | 1175 IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorWelcomeBackTest, |
1177 WelcomeBackStandard) { | 1176 WelcomeBackStandard) { |
1178 ASSERT_NO_FATAL_FAILURE( | 1177 ASSERT_NO_FATAL_FAILURE( |
1179 StartBrowser(StartupBrowserCreator::WelcomeBackPage::kWelcomeStandard)); | 1178 StartBrowser(StartupBrowserCreator::WelcomeBackPage::kWelcomeStandard)); |
1180 ExpectUrlInBrowserAtPosition(StartupTabProviderImpl::GetWelcomePageUrl(false), | 1179 ExpectUrlInBrowserAtPosition(StartupTabProviderImpl::GetWelcomePageUrl(false), |
1181 0); | 1180 0); |
1182 } | 1181 } |
OLD | NEW |