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

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

Issue 714133002: Add more management policy checking after extension installed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS compile Created 6 years, 1 month 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(crx_file::id_util::IdIsValid(extension->id())); 72 EXPECT_TRUE(crx_file::id_util::IdIsValid(extension->id()));
73 if (!extension.get() || !crx_file::id_util::IdIsValid(extension->id())) 73 if (!extension.get() || !crx_file::id_util::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 extensions::Extension::DISABLE_NONE,
79 syncer::StringOrdinal::CreateInitialOrdinal(), 80 syncer::StringOrdinal::CreateInitialOrdinal(),
80 std::string()); 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
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 231
231 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { 232 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
232 #if defined(OS_WIN) 233 #if defined(OS_WIN)
233 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); 234 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
234 #elif defined(OS_POSIX) 235 #elif defined(OS_POSIX)
235 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); 236 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
236 #else 237 #else
237 NOTREACHED(); 238 NOTREACHED();
238 #endif 239 #endif
239 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698