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/media_galleries/media_galleries_test_util.h" | 5 #include "chrome/browser/media_galleries/media_galleries_test_util.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 *manifest.get(), | 69 *manifest.get(), |
70 extensions::Extension::NO_FLAGS, &errors); | 70 extensions::Extension::NO_FLAGS, &errors); |
71 EXPECT_TRUE(extension.get() != NULL) << errors; | 71 EXPECT_TRUE(extension.get() != NULL) << errors; |
72 EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id())); | 72 EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id())); |
73 if (!extension.get() || !extensions::Extension::IdIsValid(extension->id())) | 73 if (!extension.get() || !extensions::Extension::IdIsValid(extension->id())) |
74 return NULL; | 74 return NULL; |
75 | 75 |
76 extension_prefs->OnExtensionInstalled( | 76 extension_prefs->OnExtensionInstalled( |
77 extension.get(), | 77 extension.get(), |
78 extensions::Extension::ENABLED, | 78 extensions::Extension::ENABLED, |
79 false, | |
80 false, | |
81 syncer::StringOrdinal::CreateInitialOrdinal(), | 79 syncer::StringOrdinal::CreateInitialOrdinal(), |
82 std::string()); | 80 std::string()); |
83 ExtensionService* extension_service = | 81 ExtensionService* extension_service = |
84 extensions::ExtensionSystem::Get(profile)->extension_service(); | 82 extensions::ExtensionSystem::Get(profile)->extension_service(); |
85 extension_service->AddExtension(extension.get()); | 83 extension_service->AddExtension(extension.get()); |
86 extension_service->EnableExtension(extension->id()); | 84 extension_service->EnableExtension(extension->id()); |
87 | 85 |
88 return extension; | 86 return extension; |
89 } | 87 } |
90 | 88 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 | 204 |
207 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { | 205 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { |
208 #if defined(OS_WIN) | 206 #if defined(OS_WIN) |
209 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); | 207 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); |
210 #elif defined(OS_POSIX) | 208 #elif defined(OS_POSIX) |
211 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); | 209 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); |
212 #else | 210 #else |
213 NOTREACHED(); | 211 NOTREACHED(); |
214 #endif | 212 #endif |
215 } | 213 } |
OLD | NEW |