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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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, | 79 false, |
80 syncer::StringOrdinal::CreateInitialOrdinal()); | 80 syncer::StringOrdinal::CreateInitialOrdinal(), |
| 81 std::string()); |
81 ExtensionService* extension_service = | 82 ExtensionService* extension_service = |
82 extensions::ExtensionSystem::Get(profile)->extension_service(); | 83 extensions::ExtensionSystem::Get(profile)->extension_service(); |
83 extension_service->AddExtension(extension.get()); | 84 extension_service->AddExtension(extension.get()); |
84 extension_service->EnableExtension(extension->id()); | 85 extension_service->EnableExtension(extension->id()); |
85 | 86 |
86 return extension; | 87 return extension; |
87 } | 88 } |
88 | 89 |
89 EnsureMediaDirectoriesExists::EnsureMediaDirectoriesExists() | 90 EnsureMediaDirectoriesExists::EnsureMediaDirectoriesExists() |
90 : num_galleries_(0) { | 91 : num_galleries_(0) { |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 | 205 |
205 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { | 206 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { |
206 #if defined(OS_WIN) | 207 #if defined(OS_WIN) |
207 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); | 208 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); |
208 #elif defined(OS_POSIX) | 209 #elif defined(OS_POSIX) |
209 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); | 210 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); |
210 #else | 211 #else |
211 NOTREACHED(); | 212 NOTREACHED(); |
212 #endif | 213 #endif |
213 } | 214 } |
OLD | NEW |