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

Side by Side Diff: chrome/common/extensions/permissions/permission_set_unittest.cc

Issue 16256023: Move systemInfo.memory API out of experimental namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved merge conflict from new commits Created 7 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_file_value_serializer.h" 6 #include "base/json/json_file_value_serializer.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 skip.insert(APIPermission::kFullscreen); 630 skip.insert(APIPermission::kFullscreen);
631 skip.insert(APIPermission::kIdle); 631 skip.insert(APIPermission::kIdle);
632 skip.insert(APIPermission::kNotification); 632 skip.insert(APIPermission::kNotification);
633 skip.insert(APIPermission::kPointerLock); 633 skip.insert(APIPermission::kPointerLock);
634 skip.insert(APIPermission::kPower); 634 skip.insert(APIPermission::kPower);
635 skip.insert(APIPermission::kPushMessaging); 635 skip.insert(APIPermission::kPushMessaging);
636 skip.insert(APIPermission::kSessionRestore); 636 skip.insert(APIPermission::kSessionRestore);
637 skip.insert(APIPermission::kScreensaver); 637 skip.insert(APIPermission::kScreensaver);
638 skip.insert(APIPermission::kStorage); 638 skip.insert(APIPermission::kStorage);
639 skip.insert(APIPermission::kSystemInfoCpu); 639 skip.insert(APIPermission::kSystemInfoCpu);
640 skip.insert(APIPermission::kSystemInfoMemory);
640 skip.insert(APIPermission::kSystemInfoDisplay); 641 skip.insert(APIPermission::kSystemInfoDisplay);
641 skip.insert(APIPermission::kTts); 642 skip.insert(APIPermission::kTts);
642 skip.insert(APIPermission::kUnlimitedStorage); 643 skip.insert(APIPermission::kUnlimitedStorage);
643 skip.insert(APIPermission::kWebView); 644 skip.insert(APIPermission::kWebView);
644 645
645 // TODO(erikkay) add a string for this permission. 646 // TODO(erikkay) add a string for this permission.
646 skip.insert(APIPermission::kBackground); 647 skip.insert(APIPermission::kBackground);
647 648
648 skip.insert(APIPermission::kClipboardWrite); 649 skip.insert(APIPermission::kClipboardWrite);
649 650
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 apis.insert(APIPermission::kSyncFileSystem); 1352 apis.insert(APIPermission::kSyncFileSystem);
1352 EXPECT_TRUE(extension->is_platform_app()); 1353 EXPECT_TRUE(extension->is_platform_app());
1353 EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSyncFileSystem)); 1354 EXPECT_TRUE(extension->HasAPIPermission(APIPermission::kSyncFileSystem));
1354 std::vector<string16> warnings = 1355 std::vector<string16> warnings =
1355 PermissionsData::GetPermissionMessageStrings(extension.get()); 1356 PermissionsData::GetPermissionMessageStrings(extension.get());
1356 EXPECT_TRUE(Contains(warnings, "Store data in your Google Drive account")); 1357 EXPECT_TRUE(Contains(warnings, "Store data in your Google Drive account"));
1357 ASSERT_EQ(1u, warnings.size()); 1358 ASSERT_EQ(1u, warnings.size());
1358 } 1359 }
1359 1360
1360 } // namespace extensions 1361 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698