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

Side by Side Diff: chrome/browser/media_galleries/media_galleries_test_util.cc

Issue 282103003: Moved IS_EPHEMERAL flag to extension prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix up file header Created 6 years, 7 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
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/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
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 false,
80 syncer::StringOrdinal::CreateInitialOrdinal(), 81 syncer::StringOrdinal::CreateInitialOrdinal(),
81 std::string()); 82 std::string());
82 ExtensionService* extension_service = 83 ExtensionService* extension_service =
83 extensions::ExtensionSystem::Get(profile)->extension_service(); 84 extensions::ExtensionSystem::Get(profile)->extension_service();
84 extension_service->AddExtension(extension.get()); 85 extension_service->AddExtension(extension.get());
85 extension_service->EnableExtension(extension->id()); 86 extension_service->EnableExtension(extension->id());
86 87
87 return extension; 88 return extension;
88 } 89 }
89 90
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 206
206 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { 207 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
207 #if defined(OS_WIN) 208 #if defined(OS_WIN)
208 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); 209 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
209 #elif defined(OS_POSIX) 210 #elif defined(OS_POSIX)
210 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); 211 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
211 #else 212 #else
212 NOTREACHED(); 213 NOTREACHED();
213 #endif 214 #endif
214 } 215 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698