chrome/browser/component_updater/component_installers_unittest.cc - Issue 1301883002: Revert of base: Remove using:: declaration from version.h header.

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/component_installers_unittest.cc

Issue 1301883002: Revert of base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/component_updater/ev_whitelist_component_installer.cc » ('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 "base/files/file_path.h"	5 #include "base/files/file_path.h"

6 #include "base/files/file_util.h"	6 #include "base/files/file_util.h"

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

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

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 }	73 }

74	74

75 JSONFileValueDeserializer deserializer(manifest);	75 JSONFileValueDeserializer deserializer(manifest);

76 std::string error;	76 std::string error;

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

78 deserializer.Deserialize(NULL, &error)));	78 deserializer.Deserialize(NULL, &error)));

79 ASSERT_TRUE(root);	79 ASSERT_TRUE(root);

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

81	81

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

83 base::Version version;	83 Version version;

84 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version));	84 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version));

85 EXPECT_TRUE(version.IsValid());	85 EXPECT_TRUE(version.IsValid());

86 }	86 }

87	87

88 } // namespace component_updater	88 } // namespace component_updater

OLD	NEW