Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Side by Side Diff: chrome/browser/extensions/extension_apitest.cc

Issue 22295002: Base infrastructure for Networking Private API on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compilation error. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name, 266 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
267 const std::string& page_url) { 267 const std::string& page_url) {
268 return RunExtensionSubtest(extension_name, page_url, kFlagEnableFileAccess); 268 return RunExtensionSubtest(extension_name, page_url, kFlagEnableFileAccess);
269 } 269 }
270 270
271 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name, 271 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
272 const std::string& page_url, 272 const std::string& page_url,
273 int flags) { 273 int flags) {
274 DCHECK(!page_url.empty()) << "Argument page_url is required."; 274 DCHECK(!page_url.empty()) << "Argument page_url is required.";
275 // See http://crbug.com/177163 for details. 275 // See http://crbug.com/177163 for details.
276 #if defined(OS_WIN) && !defined(NDEBUG) 276 //#if defined(OS_WIN) && !defined(NDEBUG)
277 LOG(WARNING) << "Workaround for 177163, prematurely returning"; 277 // LOG(WARNING) << "Workaround for 177163, prematurely returning";
278 return true; 278 // return true;
279 #endif 279 //#endif
stevenjb 2013/08/13 23:39:04 Eliminate before committing.
mef 2013/08/21 17:25:34 Will do, I had to comment it out to get my tests t
mef 2013/09/11 20:55:08 Done.
280 return RunExtensionTestImpl(extension_name, page_url, NULL, flags); 280 return RunExtensionTestImpl(extension_name, page_url, NULL, flags);
281 } 281 }
282 282
283 283
284 bool ExtensionApiTest::RunPageTest(const std::string& page_url) { 284 bool ExtensionApiTest::RunPageTest(const std::string& page_url) {
285 return RunExtensionSubtest("", page_url); 285 return RunExtensionSubtest("", page_url);
286 } 286 }
287 287
288 bool ExtensionApiTest::RunPageTest(const std::string& page_url, 288 bool ExtensionApiTest::RunPageTest(const std::string& page_url,
289 int flags) { 289 int flags) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 test_config_->SetInteger(kTestWebSocketPort, 435 test_config_->SetInteger(kTestWebSocketPort,
436 websocket_server_->host_port_pair().port()); 436 websocket_server_->host_port_pair().port());
437 437
438 return true; 438 return true;
439 } 439 }
440 440
441 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) { 441 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
442 ExtensionBrowserTest::SetUpCommandLine(command_line); 442 ExtensionBrowserTest::SetUpCommandLine(command_line);
443 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); 443 test_data_dir_ = test_data_dir_.AppendASCII("api_test");
444 } 444 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698