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

Side by Side Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 10683003: Moved CrxInstaller and CrxInstallerError into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master Created 8 years, 5 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/extensions/extension_service_unittest.h" 5 #include "chrome/browser/extensions/extension_service_unittest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #include "webkit/plugins/npapi/mock_plugin_list.h" 92 #include "webkit/plugins/npapi/mock_plugin_list.h"
93 #include "webkit/quota/quota_manager.h" 93 #include "webkit/quota/quota_manager.h"
94 94
95 using content::BrowserContext; 95 using content::BrowserContext;
96 using content::BrowserThread; 96 using content::BrowserThread;
97 using content::DOMStorageContext; 97 using content::DOMStorageContext;
98 using content::IndexedDBContext; 98 using content::IndexedDBContext;
99 using content::PluginService; 99 using content::PluginService;
100 using extensions::APIPermission; 100 using extensions::APIPermission;
101 using extensions::APIPermissionSet; 101 using extensions::APIPermissionSet;
102 using extensions::CrxInstaller;
102 using extensions::Extension; 103 using extensions::Extension;
103 using extensions::ExtensionCreator; 104 using extensions::ExtensionCreator;
104 using extensions::ExtensionPrefs; 105 using extensions::ExtensionPrefs;
105 using extensions::ExtensionSystem; 106 using extensions::ExtensionSystem;
106 using extensions::PermissionSet; 107 using extensions::PermissionSet;
107 108
108 namespace keys = extension_manifest_keys; 109 namespace keys = extension_manifest_keys;
109 110
110 namespace { 111 namespace {
111 112
(...skipping 5125 matching lines...) Expand 10 before | Expand all | Expand 10 after
5237 // This should NOT trigger an alert. 5238 // This should NOT trigger an alert.
5238 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", 5239 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0",
5239 data_dir_.AppendASCII("hosted_app.crx")); 5240 data_dir_.AppendASCII("hosted_app.crx"));
5240 5241
5241 service_->CheckForExternalUpdates(); 5242 service_->CheckForExternalUpdates();
5242 loop_.RunAllPending(); 5243 loop_.RunAllPending();
5243 5244
5244 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); 5245 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get()));
5245 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); 5246 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size());
5246 } 5247 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/test_extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698