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

Side by Side Diff: chrome/browser/chromeos/extensions/networking_private_apitest.cc

Issue 15061007: Added a PolicyDomainDescriptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/user.h" 7 #include "chrome/browser/chromeos/login/user.h"
8 #include "chrome/browser/chromeos/login/user_manager.h" 8 #include "chrome/browser/chromeos/login/user_manager.h"
9 #include "chrome/browser/chromeos/policy/network_configuration_updater.h" 9 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 bool RunNetworkingSubtest(const std::string& subtest) { 66 bool RunNetworkingSubtest(const std::string& subtest) {
67 return RunExtensionSubtest( 67 return RunExtensionSubtest(
68 "networking", "main.html?" + subtest, 68 "networking", "main.html?" + subtest,
69 kFlagEnableFileAccess | kFlagLoadAsComponent); 69 kFlagEnableFileAccess | kFlagLoadAsComponent);
70 } 70 }
71 71
72 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 72 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
73 EXPECT_CALL(provider_, IsInitializationComplete(_)) 73 EXPECT_CALL(provider_, IsInitializationComplete(_))
74 .WillRepeatedly(Return(true)); 74 .WillRepeatedly(Return(true));
75 EXPECT_CALL(provider_, RegisterPolicyDomain(_, _)).Times(AnyNumber()); 75 EXPECT_CALL(provider_, RegisterPolicyDomain(_)).Times(AnyNumber());
Mattias Nissler (ping if slow) 2013/05/15 10:24:06 It seems like there are a large number of tests th
Joao da Silva 2013/05/19 13:17:55 Agreed, filed http://crbug.com/242087 and left a T
76 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); 76 policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
77 77
78 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 78 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
79 } 79 }
80 80
81 void InitializeSanitizedUsername() { 81 void InitializeSanitizedUsername() {
82 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 82 chromeos::UserManager* user_manager = chromeos::UserManager::Get();
83 chromeos::User* user = user_manager->GetActiveUser(); 83 chromeos::User* user = user_manager->GetActiveUser();
84 CHECK(user); 84 CHECK(user);
85 std::string userhash; 85 std::string userhash;
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_; 309 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_;
310 } 310 }
311 311
312 IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, 312 IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
313 VerifyAndEncryptData) { 313 VerifyAndEncryptData) {
314 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; 314 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
315 } 315 }
316 316
317 317
318 } // namespace chromeos 318 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698