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

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

Issue 16915006: Convert most of extensions and some other random stuff to using the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "webkit/common/database/database_identifier.h" 109 #include "webkit/common/database/database_identifier.h"
110 #include "webkit/plugins/npapi/mock_plugin_list.h" 110 #include "webkit/plugins/npapi/mock_plugin_list.h"
111 111
112 #if defined(OS_CHROMEOS) 112 #if defined(OS_CHROMEOS)
113 #include "chrome/browser/chromeos/extensions/install_limiter.h" 113 #include "chrome/browser/chromeos/extensions/install_limiter.h"
114 #include "chrome/browser/chromeos/login/user_manager.h" 114 #include "chrome/browser/chromeos/login/user_manager.h"
115 #include "chrome/browser/chromeos/settings/cros_settings.h" 115 #include "chrome/browser/chromeos/settings/cros_settings.h"
116 #include "chrome/browser/chromeos/settings/device_settings_service.h" 116 #include "chrome/browser/chromeos/settings/device_settings_service.h"
117 #endif 117 #endif
118 118
119 using base::DictionaryValue;
120 using base::ListValue;
121 using base::Value;
119 using content::BrowserContext; 122 using content::BrowserContext;
120 using content::BrowserThread; 123 using content::BrowserThread;
121 using content::DOMStorageContext; 124 using content::DOMStorageContext;
122 using content::IndexedDBContext; 125 using content::IndexedDBContext;
123 using content::PluginService; 126 using content::PluginService;
124 using extensions::APIPermission; 127 using extensions::APIPermission;
125 using extensions::APIPermissionSet; 128 using extensions::APIPermissionSet;
126 using extensions::CrxInstaller; 129 using extensions::CrxInstaller;
127 using extensions::Extension; 130 using extensions::Extension;
128 using extensions::ExtensionCreator; 131 using extensions::ExtensionCreator;
(...skipping 5958 matching lines...) Expand 10 before | Expand all | Expand 10 after
6087 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF); 6090 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF);
6088 AddMockExternalProvider(provider); 6091 AddMockExternalProvider(provider);
6089 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path); 6092 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path);
6090 6093
6091 service_->CheckForExternalUpdates(); 6094 service_->CheckForExternalUpdates();
6092 loop_.RunUntilIdle(); 6095 loop_.RunUntilIdle();
6093 EXPECT_TRUE(extensions::HasExternalInstallError(service_)); 6096 EXPECT_TRUE(extensions::HasExternalInstallError(service_));
6094 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_)); 6097 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_));
6095 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore)); 6098 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore));
6096 } 6099 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698