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

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

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name()); 1256 EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name());
1257 EXPECT_EQ(std::string(), loaded_[1]->description()); 1257 EXPECT_EQ(std::string(), loaded_[1]->description());
1258 EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"), 1258 EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"),
1259 extensions::BackgroundInfo::GetBackgroundURL(loaded_[1].get())); 1259 extensions::BackgroundInfo::GetBackgroundURL(loaded_[1].get()));
1260 EXPECT_EQ(0u, 1260 EXPECT_EQ(0u,
1261 extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get()) 1261 extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get())
1262 .size()); 1262 .size());
1263 1263
1264 // We don't parse the plugins section on Chrome OS. 1264 // We don't parse the plugins section on Chrome OS.
1265 #if defined(OS_CHROMEOS) 1265 #if defined(OS_CHROMEOS)
1266 EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(loaded_[1])); 1266 EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(loaded_[1].get()));
1267 #else 1267 #else
1268 ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1].get())); 1268 ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1].get()));
1269 const std::vector<extensions::PluginInfo>* plugins = 1269 const std::vector<extensions::PluginInfo>* plugins =
1270 extensions::PluginInfo::GetPlugins(loaded_[1].get()); 1270 extensions::PluginInfo::GetPlugins(loaded_[1].get());
1271 ASSERT_TRUE(plugins); 1271 ASSERT_TRUE(plugins);
1272 ASSERT_EQ(2u, plugins->size()); 1272 ASSERT_EQ(2u, plugins->size());
1273 EXPECT_EQ(loaded_[1]->path().AppendASCII("content_plugin.dll").value(), 1273 EXPECT_EQ(loaded_[1]->path().AppendASCII("content_plugin.dll").value(),
1274 plugins->at(0).path.value()); 1274 plugins->at(0).path.value());
1275 EXPECT_TRUE(plugins->at(0).is_public); 1275 EXPECT_TRUE(plugins->at(0).is_public);
1276 EXPECT_EQ(loaded_[1]->path().AppendASCII("extension_plugin.dll").value(), 1276 EXPECT_EQ(loaded_[1]->path().AppendASCII("extension_plugin.dll").value(),
(...skipping 4742 matching lines...) Expand 10 before | Expand all | Expand 10 after
6019 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF); 6019 new MockExtensionProvider(service_, Manifest::EXTERNAL_PREF);
6020 AddMockExternalProvider(provider); 6020 AddMockExternalProvider(provider);
6021 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path); 6021 provider->UpdateOrAddExtension(updates_from_webstore, "1", crx_path);
6022 6022
6023 service_->CheckForExternalUpdates(); 6023 service_->CheckForExternalUpdates();
6024 loop_.RunUntilIdle(); 6024 loop_.RunUntilIdle();
6025 EXPECT_TRUE(extensions::HasExternalInstallError(service_)); 6025 EXPECT_TRUE(extensions::HasExternalInstallError(service_));
6026 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_)); 6026 EXPECT_FALSE(extensions::HasExternalInstallBubble(service_));
6027 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore)); 6027 EXPECT_FALSE(service_->IsExtensionEnabled(updates_from_webstore));
6028 } 6028 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/web_socket_proxy.cc ('k') | chrome/browser/google/google_util_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698