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

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

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
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_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/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.h" 11 #include "base/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 "content/test/test_browser_thread.h" 16 #include "content/public/test/test_browser_thread.h"
17 17
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 using content::BrowserThread; 20 using content::BrowserThread;
21 21
22 namespace { 22 namespace {
23 // File name of the Pepper Flash plugin on different platforms. 23 // File name of the Pepper Flash plugin on different platforms.
24 const FilePath::CharType kDataPath[] = 24 const FilePath::CharType kDataPath[] =
25 #if defined(OS_MACOSX) 25 #if defined(OS_MACOSX)
26 FILE_PATH_LITERAL("components/flapper/mac"); 26 FILE_PATH_LITERAL("components/flapper/mac");
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error)); 58 scoped_ptr<base::Value> root(serializer.Deserialize(NULL, &error));
59 ASSERT_TRUE(root.get() != NULL); 59 ASSERT_TRUE(root.get() != NULL);
60 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 60 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
61 61
62 // This checks that the whole manifest is compatible. 62 // This checks that the whole manifest is compatible.
63 Version version; 63 Version version;
64 EXPECT_TRUE(CheckPepperFlashManifest( 64 EXPECT_TRUE(CheckPepperFlashManifest(
65 static_cast<base::DictionaryValue*>(root.get()), &version)); 65 static_cast<base::DictionaryValue*>(root.get()), &version));
66 EXPECT_TRUE(version.IsValid()); 66 EXPECT_TRUE(version.IsValid());
67 } 67 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698