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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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 "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" 5 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/extensions/features/feature_channel.h" 10 #include "chrome/common/extensions/features/feature_channel.h"
11 #include "components/version_info/version_info.h"
11 #include "extensions/common/constants.h" 12 #include "extensions/common/constants.h"
12 #include "extensions/common/error_utils.h" 13 #include "extensions/common/error_utils.h"
13 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
14 #include "extensions/common/manifest_constants.h" 15 #include "extensions/common/manifest_constants.h"
15 #include "extensions/common/manifest_handlers/background_info.h" 16 #include "extensions/common/manifest_handlers/background_info.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 18
18 namespace extensions { 19 namespace extensions {
19 20
20 namespace errors = manifest_errors; 21 namespace errors = manifest_errors;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension.get())); 103 EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension.get()));
103 104
104 base::ListValue* permissions = new base::ListValue(); 105 base::ListValue* permissions = new base::ListValue();
105 permissions->Append(new base::StringValue("webRequest")); 106 permissions->Append(new base::StringValue("webRequest"));
106 manifest->Set(keys::kPermissions, permissions); 107 manifest->Set(keys::kPermissions, permissions);
107 LoadAndExpectError(ManifestData(manifest.get(), ""), 108 LoadAndExpectError(ManifestData(manifest.get(), ""),
108 errors::kWebRequestConflictsWithLazyBackground); 109 errors::kWebRequestConflictsWithLazyBackground);
109 } 110 }
110 111
111 } // namespace extensions 112 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698