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

Side by Side Diff: chrome/browser/chromeos/login/test/oobe_base_test.cc

Issue 320063002: NetworkingPrivate API events should supply list of GUIDs, not service paths (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 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 "chrome/browser/chromeos/login/test/oobe_base_test.h" 5 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 embedded_test_server()->StopThread(); 51 embedded_test_server()->StopThread();
52 52
53 ExtensionApiTest::SetUp(); 53 ExtensionApiTest::SetUp();
54 } 54 }
55 55
56 void OobeBaseTest::SetUpInProcessBrowserTestFixture() { 56 void OobeBaseTest::SetUpInProcessBrowserTestFixture() {
57 host_resolver()->AddRule("*", "127.0.0.1"); 57 host_resolver()->AddRule("*", "127.0.0.1");
58 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); 58 network_portal_detector_ = new NetworkPortalDetectorTestImpl();
59 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); 59 NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
60 network_portal_detector_->SetDefaultNetworkPathForTesting( 60 network_portal_detector_->SetDefaultNetworkPathForTesting(
61 FakeShillManagerClient::kFakeEthernetNetworkPath); 61 FakeShillManagerClient::kFakeEthernetNetworkPath,
62 FakeShillManagerClient::kFakeEthernetNetworkPath /* guid */);
62 63
63 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 64 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
64 } 65 }
65 66
66 void OobeBaseTest::SetUpOnMainThread() { 67 void OobeBaseTest::SetUpOnMainThread() {
67 // Restart the thread as the sandbox host process has already been spawned. 68 // Restart the thread as the sandbox host process has already been spawned.
68 embedded_test_server()->RestartThreadAndListen(); 69 embedded_test_server()->RestartThreadAndListen();
69 70
70 ExtensionApiTest::SetUpOnMainThread(); 71 ExtensionApiTest::SetUpOnMainThread();
71 } 72 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 169
169 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() { 170 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() {
170 ExistingUserController* controller = 171 ExistingUserController* controller =
171 ExistingUserController::current_controller(); 172 ExistingUserController::current_controller();
172 CHECK(controller); 173 CHECK(controller);
173 return static_cast<WebUILoginDisplay*>( 174 return static_cast<WebUILoginDisplay*>(
174 controller->login_display()); 175 controller->login_display());
175 } 176 }
176 177
177 } // namespace chromeos 178 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698