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 <algorithm> | 5 #include <algorithm> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 | 86 |
87 class StartupBrowserCreatorTest : public ExtensionBrowserTest { | 87 class StartupBrowserCreatorTest : public ExtensionBrowserTest { |
88 protected: | 88 protected: |
89 virtual bool SetUpUserDataDirectory() OVERRIDE { | 89 virtual bool SetUpUserDataDirectory() OVERRIDE { |
90 return ExtensionBrowserTest::SetUpUserDataDirectory(); | 90 return ExtensionBrowserTest::SetUpUserDataDirectory(); |
91 } | 91 } |
92 | 92 |
93 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 93 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
94 ExtensionBrowserTest::SetUpCommandLine(command_line); | 94 ExtensionBrowserTest::SetUpCommandLine(command_line); |
95 command_line->AppendSwitch(switches::kEnablePanels); | 95 command_line->AppendSwitch(switches::kEnablePanels); |
96 command_line->AppendSwitchASCII(switches::kHomePage, | 96 command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL); |
97 content::kAboutBlankURL); | |
98 #if defined(OS_CHROMEOS) | 97 #if defined(OS_CHROMEOS) |
99 // TODO(nkostylev): Investigate if we can remove this switch. | 98 // TODO(nkostylev): Investigate if we can remove this switch. |
100 command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests); | 99 command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests); |
101 #endif | 100 #endif |
102 } | 101 } |
103 | 102 |
104 // Helper functions return void so that we can ASSERT*(). | 103 // Helper functions return void so that we can ASSERT*(). |
105 // Use ASSERT_NO_FATAL_FAILURE around calls to these functions to stop the | 104 // Use ASSERT_NO_FATAL_FAILURE around calls to these functions to stop the |
106 // test if an assert fails. | 105 // test if an assert fails. |
107 void LoadApp(const std::string& app_name, | 106 void LoadApp(const std::string& app_name, |
(...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1435 ASSERT_EQ(1, tab_strip->count()); | 1434 ASSERT_EQ(1, tab_strip->count()); |
1436 EXPECT_EQ("title1.html", | 1435 EXPECT_EQ("title1.html", |
1437 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); | 1436 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); |
1438 } | 1437 } |
1439 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 1438 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
1440 | 1439 |
1441 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || | 1440 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || |
1442 // defined(ENABLE_CONFIGURATION_POLICY) | 1441 // defined(ENABLE_CONFIGURATION_POLICY) |
1443 | 1442 |
1444 #endif // !defined(OS_CHROMEOS) | 1443 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |