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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 24579003: Clean up remaining unused globals (on mac). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: staticmedia Created 7 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/login/user.h" 8 #include "chrome/browser/chromeos/login/user.h"
9 #include "chrome/browser/chromeos/login/user_manager.h" 9 #include "chrome/browser/chromeos/login/user_manager.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 17 matching lines...) Expand all
28 #include "chromeos/network/onc/onc_utils.h" 28 #include "chromeos/network/onc/onc_utils.h"
29 #include "policy/policy_constants.h" 29 #include "policy/policy_constants.h"
30 #include "third_party/cros_system_api/dbus/service_constants.h" 30 #include "third_party/cros_system_api/dbus/service_constants.h"
31 #endif // OS_CHROMEOS 31 #endif // OS_CHROMEOS
32 using testing::AnyNumber; 32 using testing::AnyNumber;
33 using testing::Return; 33 using testing::Return;
34 using testing::_; 34 using testing::_;
35 35
36 namespace chromeos { 36 namespace chromeos {
37 37
38 namespace { 38 #if defined(OS_CHROMEOS)
39
40 const char kUser1ProfilePath[] = "/profile/user1/shill"; 39 const char kUser1ProfilePath[] = "/profile/user1/shill";
41 const char kUserIdStubHashSuffix[] = "-hash"; 40 const char kUserIdStubHashSuffix[] = "-hash";
41 #endif // defined(OS_CHROMEOS)
42 42
43 } // namespace
44 43
45 class ExtensionNetworkingPrivateApiTest : 44 class ExtensionNetworkingPrivateApiTest :
46 public ExtensionApiTest, 45 public ExtensionApiTest,
47 public testing::WithParamInterface<bool> { 46 public testing::WithParamInterface<bool> {
48 public: 47 public:
49 bool RunNetworkingSubtest(const std::string& subtest) { 48 bool RunNetworkingSubtest(const std::string& subtest) {
50 return RunExtensionSubtest( 49 return RunExtensionSubtest(
51 "networking", "main.html?" + subtest, 50 "networking", "main.html?" + subtest,
52 kFlagEnableFileAccess | kFlagLoadAsComponent); 51 kFlagEnableFileAccess | kFlagLoadAsComponent);
53 } 52 }
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, 366 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
368 VerifyAndEncryptData) { 367 VerifyAndEncryptData) {
369 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; 368 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
370 } 369 }
371 370
372 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, 371 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
373 ExtensionNetworkingPrivateApiTest, 372 ExtensionNetworkingPrivateApiTest,
374 testing::Bool()); 373 testing::Bool());
375 374
376 } // namespace chromeos 375 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698