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

Side by Side Diff: chrome/test/live_sync/live_extensions_sync_test_base.cc

Issue 6766002: Replace bools in extension creation with flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For landing Created 9 years, 9 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
« no previous file with comments | « chrome/common/extensions/extension_unpacker.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/test/live_sync/live_extensions_sync_test_base.h" 5 #include "chrome/test/live_sync/live_extensions_sync_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 29 matching lines...) Expand all
40 source.Set(extension_manifest_keys::kTheme, new DictionaryValue()); 40 source.Set(extension_manifest_keys::kTheme, new DictionaryValue());
41 } 41 }
42 FilePath extension_dir; 42 FilePath extension_dir;
43 if (!file_util::CreateTemporaryDirInDir( 43 if (!file_util::CreateTemporaryDirInDir(
44 scoped_temp_dir.path(), FILE_PATH_LITERAL("fakeextension"), 44 scoped_temp_dir.path(), FILE_PATH_LITERAL("fakeextension"),
45 &extension_dir)) { 45 &extension_dir)) {
46 return NULL; 46 return NULL;
47 } 47 }
48 std::string error; 48 std::string error;
49 scoped_refptr<Extension> extension = 49 scoped_refptr<Extension> extension =
50 Extension::Create(extension_dir, 50 Extension::Create(extension_dir, Extension::INTERNAL,
51 Extension::INTERNAL, source, false, true, &error); 51 source, Extension::STRICT_ERROR_CHECKS, &error);
52 if (!error.empty()) { 52 if (!error.empty()) {
53 LOG(WARNING) << error; 53 LOG(WARNING) << error;
54 return NULL; 54 return NULL;
55 } 55 }
56 return extension; 56 return extension;
57 } 57 }
58 58
59 } // namespace 59 } // namespace
60 60
61 bool LiveExtensionsSyncTestBase::SetupClients() { 61 bool LiveExtensionsSyncTestBase::SetupClients() {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const PendingExtensionManager* pending_extension_manager = 117 const PendingExtensionManager* pending_extension_manager =
118 profile->GetExtensionService()->pending_extension_manager(); 118 profile->GetExtensionService()->pending_extension_manager();
119 PendingExtensionManager::const_iterator it; 119 PendingExtensionManager::const_iterator it;
120 for (it = pending_extension_manager->begin(); 120 for (it = pending_extension_manager->begin();
121 it != pending_extension_manager->end(); ++it) { 121 it != pending_extension_manager->end(); ++it) {
122 ExtensionIdMap::const_iterator it2 = extensions_by_id_.find(it->first); 122 ExtensionIdMap::const_iterator it2 = extensions_by_id_.find(it->first);
123 CHECK(it2 != extensions_by_id_.end()); 123 CHECK(it2 != extensions_by_id_.end());
124 InstallExtension(profile, it2->second); 124 InstallExtension(profile, it2->second);
125 } 125 }
126 } 126 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension_unpacker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698