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 "chrome/browser/extensions/platform_app_browsertest_util.h" | 5 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/extensions/api/tabs/tabs_api.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs_api.h" |
10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 135 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
136 base::FilePath test_doc(test_data_dir_.AppendASCII(test_file)); | 136 base::FilePath test_doc(test_data_dir_.AppendASCII(test_file)); |
137 test_doc = test_doc.NormalizePathSeparators(); | 137 test_doc = test_doc.NormalizePathSeparators(); |
138 command_line->AppendArgPath(test_doc); | 138 command_line->AppendArgPath(test_doc); |
139 } | 139 } |
140 | 140 |
141 ShellWindow* PlatformAppBrowserTest::CreateShellWindow( | 141 ShellWindow* PlatformAppBrowserTest::CreateShellWindow( |
142 const Extension* extension) { | 142 const Extension* extension) { |
143 ShellWindow::CreateParams params; | 143 ShellWindow::CreateParams params; |
144 return ShellWindow::Create( | 144 return ShellWindow::Create( |
145 browser()->profile(), extension, GURL(""), params); | 145 browser()->profile(), extension, GURL(std::string()), params); |
146 } | 146 } |
147 | 147 |
148 ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams( | 148 ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams( |
149 const Extension* extension, const ShellWindow::CreateParams& params) { | 149 const Extension* extension, const ShellWindow::CreateParams& params) { |
150 return ShellWindow::Create( | 150 return ShellWindow::Create( |
151 browser()->profile(), extension, GURL(""), params); | 151 browser()->profile(), extension, GURL(std::string()), params); |
152 } | 152 } |
153 | 153 |
154 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { | 154 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) { |
155 content::WindowedNotificationObserver destroyed_observer( | 155 content::WindowedNotificationObserver destroyed_observer( |
156 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, | 156 content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
157 content::NotificationService::AllSources()); | 157 content::NotificationService::AllSources()); |
158 window->GetBaseWindow()->Close(); | 158 window->GetBaseWindow()->Close(); |
159 destroyed_observer.Wait(); | 159 destroyed_observer.Wait(); |
160 } | 160 } |
161 | 161 |
162 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine( | 162 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine( |
163 CommandLine* command_line) { | 163 CommandLine* command_line) { |
164 PlatformAppBrowserTest::SetUpCommandLine(command_line); | 164 PlatformAppBrowserTest::SetUpCommandLine(command_line); |
165 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 165 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
166 } | 166 } |
167 | 167 |
168 } // namespace extensions | 168 } // namespace extensions |
OLD | NEW |