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

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

Issue 13472012: Disable checking for a 64 bit Pepper Flash until we have one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | 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/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 20 matching lines...) Expand all
31 #if defined(ARCH_CPU_X86) 31 #if defined(ARCH_CPU_X86)
32 FILE_PATH_LITERAL("components/flapper/linux"); 32 FILE_PATH_LITERAL("components/flapper/linux");
33 #elif defined(ARCH_CPU_X86_64) 33 #elif defined(ARCH_CPU_X86_64)
34 FILE_PATH_LITERAL("components/flapper/linux_x64"); 34 FILE_PATH_LITERAL("components/flapper/linux_x64");
35 #else 35 #else
36 FILE_PATH_LITERAL("components/flapper/NONEXISTENT"); 36 FILE_PATH_LITERAL("components/flapper/NONEXISTENT");
37 #endif 37 #endif
38 #endif 38 #endif
39 } 39 }
40 40
41 // TODO(jschuh): Get Pepper Flash supported on Win64 build. crbug.com/179716 41 // TODO(jschuh): Get Pepper Flash supported on Win64 build.
42 // http://crbug.com/179716
42 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) 43 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
43 #define MAYBE_PepperFlashCheck DISABLED_PepperFlashCheck 44 #define MAYBE_PepperFlashCheck DISABLED_PepperFlashCheck
45 // TODO(avi): Get Pepper Flash supported on the Mac 64 bit build.
46 // http://crbug.com/225777
47 #elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_64)
48 #define MAYBE_PepperFlashCheck DISABLED_PepperFlashCheck
44 #else 49 #else
45 #define MAYBE_PepperFlashCheck PepperFlashCheck 50 #define MAYBE_PepperFlashCheck PepperFlashCheck
46 #endif 51 #endif
47 52
48 // TODO(viettrungluu): Separate out into two separate tests; use a test fixture. 53 // TODO(viettrungluu): Separate out into two separate tests; use a test fixture.
49 TEST(ComponentInstallerTest, MAYBE_PepperFlashCheck) { 54 TEST(ComponentInstallerTest, MAYBE_PepperFlashCheck) {
50 MessageLoop message_loop; 55 MessageLoop message_loop;
51 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); 56 content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
52 57
53 ppapi::PpapiGlobals::PerThreadForTest per_thread_for_test; 58 ppapi::PpapiGlobals::PerThreadForTest per_thread_for_test;
(...skipping 16 matching lines...) Expand all
70 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error)); 75 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error));
71 ASSERT_TRUE(root.get() != NULL); 76 ASSERT_TRUE(root.get() != NULL);
72 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 77 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
73 78
74 // This checks that the whole manifest is compatible. 79 // This checks that the whole manifest is compatible.
75 Version version; 80 Version version;
76 EXPECT_TRUE(CheckPepperFlashManifest( 81 EXPECT_TRUE(CheckPepperFlashManifest(
77 static_cast<base::DictionaryValue*>(root.get()), &version)); 82 static_cast<base::DictionaryValue*>(root.get()), &version));
78 EXPECT_TRUE(version.IsValid()); 83 EXPECT_TRUE(version.IsValid());
79 } 84 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698