chrome/browser/component_updater/test/component_installers_unittest.cc - Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/component_updater/test/component_installers_unittest.cc

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/component_updater/swiftshader_component_installer.cc ('k') | chrome/browser/component_updater/test/component_updater_service_unittest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/browser/component_updater/flash_component_installer.h"	5 #include "chrome/browser/component_updater/flash_component_installer.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/json/json_file_value_serializer.h"	9 #include "base/json/json_file_value_serializer.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 }	71 }

72	72

73 JSONFileValueSerializer serializer(manifest);	73 JSONFileValueSerializer serializer(manifest);

74 std::string error;	74 std::string error;

75 scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(	75 scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(

76 serializer.Deserialize(NULL, &error)));	76 serializer.Deserialize(NULL, &error)));

77 ASSERT_TRUE(root);	77 ASSERT_TRUE(root);

78 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));	78 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));

79	79

80 // This checks that the whole manifest is compatible.	80 // This checks that the whole manifest is compatible.

81 base::Version version;	81 Version version;

82 EXPECT_TRUE(CheckPepperFlashManifest(*root, &version));	82 EXPECT_TRUE(CheckPepperFlashManifest(*root, &version));

83 EXPECT_TRUE(version.IsValid());	83 EXPECT_TRUE(version.IsValid());

84 }	84 }

OLD	NEW