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

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

Issue 11880029: FileBrowserHandlerManifestTest.FileManagerURLOverride test fails on Chromeium OS valgrind bot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch - II Created 7 years, 11 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 | tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/string_number_conversions.h" 5 #include "base/string_number_conversions.h"
6 #include "chrome/browser/chromeos/extensions/file_browser_handler.h" 6 #include "chrome/browser/chromeos/extensions/file_browser_handler.h"
7 #include "chrome/common/extensions/extension_builder.h" 7 #include "chrome/common/extensions/extension_builder.h"
8 #include "chrome/common/extensions/extension_manifest_constants.h" 8 #include "chrome/common/extensions/extension_manifest_constants.h"
9 #include "chrome/common/extensions/manifest_handler.h" 9 #include "chrome/common/extensions/manifest_handler.h"
10 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 10 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
11 #include "chrome/common/extensions/manifest_url_handler.h"
11 #include "chrome/common/extensions/value_builder.h" 12 #include "chrome/common/extensions/value_builder.h"
12 #include "extensions/common/error_utils.h" 13 #include "extensions/common/error_utils.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 namespace errors = extension_manifest_errors; 16 namespace errors = extension_manifest_errors;
16 17
17 using extensions::DictionaryBuilder; 18 using extensions::DictionaryBuilder;
18 using extensions::Extension; 19 using extensions::Extension;
19 using extensions::ExtensionBuilder; 20 using extensions::ExtensionBuilder;
20 using extensions::ListBuilder; 21 using extensions::ListBuilder;
21 22
22 namespace { 23 namespace {
23 24
24 class FileBrowserHandlerManifestTest : public ExtensionManifestTest { 25 class FileBrowserHandlerManifestTest : public ExtensionManifestTest {
25 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() OVERRIDE {
26 ExtensionManifestTest::SetUp(); 27 ExtensionManifestTest::SetUp();
27 extensions::ManifestHandler::Register( 28 extensions::ManifestHandler::Register(
28 extension_manifest_keys::kFileBrowserHandlers, 29 extension_manifest_keys::kFileBrowserHandlers,
29 new FileBrowserHandlerParser); 30 new FileBrowserHandlerParser);
31 extensions::ManifestHandler::Register(
32 keys::kChromeURLOverrides,
33 new extensions::URLOverridesHandler);
30 } 34 }
31 }; 35 };
32 36
33 TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) { 37 TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) {
34 Testcase testcases[] = { 38 Testcase testcases[] = {
35 Testcase("filebrowser_invalid_access_permission.json", 39 Testcase("filebrowser_invalid_access_permission.json",
36 extensions::ErrorUtils::FormatErrorMessage( 40 extensions::ErrorUtils::FormatErrorMessage(
37 errors::kInvalidFileAccessValue, base::IntToString(1))), 41 errors::kInvalidFileAccessValue, base::IntToString(1))),
38 Testcase("filebrowser_invalid_access_permission_list.json", 42 Testcase("filebrowser_invalid_access_permission_list.json",
39 errors::kInvalidFileAccessList), 43 errors::kInvalidFileAccessList),
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 LoadExtension(Manifest(manifest_value.get(), "override_files"), 207 LoadExtension(Manifest(manifest_value.get(), "override_files"),
204 &error, Extension::COMPONENT, Extension::NO_FLAGS); 208 &error, Extension::COMPONENT, Extension::NO_FLAGS);
205 #if defined(FILE_MANAGER_EXTENSION) 209 #if defined(FILE_MANAGER_EXTENSION)
206 EXPECT_EQ("", error); 210 EXPECT_EQ("", error);
207 #else 211 #else
208 EXPECT_EQ(std::string(errors::kInvalidChromeURLOverrides), error); 212 EXPECT_EQ(std::string(errors::kInvalidChromeURLOverrides), error);
209 #endif 213 #endif
210 } 214 }
211 215
212 } // namespace 216 } // namespace
OLDNEW
« no previous file with comments | « no previous file | tools/valgrind/gtest_exclude/unit_tests.gtest_linux.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698