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

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

Issue 893823002: Register system Pepper Flash plugin if no packaged Pepper plugin is found. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments. read location of pepperflash from registry. Created 5 years, 10 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/component_updater/ppapi_utils.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('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 "chrome/browser/component_updater/flash_component_installer.h" 5 #include "chrome/browser/component_updater/flash_component_installer.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.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"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/version.h" 13 #include "base/version.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/common/pepper_flash.h"
16 #include "content/public/test/test_browser_thread.h" 17 #include "content/public/test/test_browser_thread.h"
17 #include "ppapi/shared_impl/test_globals.h" 18 #include "ppapi/shared_impl/test_globals.h"
18 19
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 using content::BrowserThread; 22 using content::BrowserThread;
22 23
23 namespace component_updater { 24 namespace component_updater {
24 25
25 namespace { 26 namespace {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 75
75 JSONFileValueSerializer serializer(manifest); 76 JSONFileValueSerializer serializer(manifest);
76 std::string error; 77 std::string error;
77 scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>( 78 scoped_ptr<base::DictionaryValue> root(static_cast<base::DictionaryValue*>(
78 serializer.Deserialize(NULL, &error))); 79 serializer.Deserialize(NULL, &error)));
79 ASSERT_TRUE(root); 80 ASSERT_TRUE(root);
80 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 81 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
81 82
82 // This checks that the whole manifest is compatible. 83 // This checks that the whole manifest is compatible.
83 Version version; 84 Version version;
84 EXPECT_TRUE(CheckPepperFlashManifest(*root, &version)); 85 EXPECT_TRUE(chrome::CheckPepperFlashManifest(*root, &version));
85 EXPECT_TRUE(version.IsValid()); 86 EXPECT_TRUE(version.IsValid());
86 } 87 }
87 88
88 } // namespace component_updater 89 } // namespace component_updater
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/ppapi_utils.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698