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

Side by Side Diff: chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc

Issue 1128913003: Fix GcdPrivateAPITest.WifiPasswords on win 7 dbg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h" 9 #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 #endif // ENABLE_MDNS 355 #endif // ENABLE_MDNS
356 356
357 #if defined(ENABLE_WIFI_BOOTSTRAPPING) 357 #if defined(ENABLE_WIFI_BOOTSTRAPPING)
358 358
359 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, WifiMessage) { 359 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, WifiMessage) {
360 EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "wifi_message.html")); 360 EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "wifi_message.html"));
361 } 361 }
362 362
363 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, WifiPasswords) { 363 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, WifiPasswords) {
364 // TODO(noamsml): Win Dbg has a workaround that makes RunExtensionSubtest
365 // always return true without actually running the test. Remove when fixed.
366 // See http://crbug.com/177163 for details.
367 #if !defined(OS_WIN) || defined(NDEBUG)
368 EXPECT_CALL(wifi_manager_factory_, WifiManagerCreated()) 364 EXPECT_CALL(wifi_manager_factory_, WifiManagerCreated())
369 .WillOnce(Invoke(this, &GcdPrivateAPITest::OnCreateWifiManager)); 365 .WillOnce(Invoke(this, &GcdPrivateAPITest::OnCreateWifiManager));
370 #endif
371 366
372 EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "wifi_password.html")); 367 EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "wifi_password.html"));
373 } 368 }
374 369
375 #endif // ENABLE_WIFI_BOOTSTRAPPING 370 #endif // ENABLE_WIFI_BOOTSTRAPPING
376 371
377 } // namespace 372 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698