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

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

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 3481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3492 blacklist->Append(new base::StringValue("*")); 3492 blacklist->Append(new base::StringValue("*"));
3493 } 3493 }
3494 3494
3495 // Install a component extension. 3495 // Install a component extension.
3496 base::FilePath path = data_dir_ 3496 base::FilePath path = data_dir_
3497 .AppendASCII("good") 3497 .AppendASCII("good")
3498 .AppendASCII("Extensions") 3498 .AppendASCII("Extensions")
3499 .AppendASCII(good0) 3499 .AppendASCII(good0)
3500 .AppendASCII("1.0.0.0"); 3500 .AppendASCII("1.0.0.0");
3501 std::string manifest; 3501 std::string manifest;
3502 ASSERT_TRUE(file_util::ReadFileToString( 3502 ASSERT_TRUE(base::ReadFileToString(
3503 path.Append(extensions::kManifestFilename), &manifest)); 3503 path.Append(extensions::kManifestFilename), &manifest));
3504 service_->component_loader()->Add(manifest, path); 3504 service_->component_loader()->Add(manifest, path);
3505 service_->Init(); 3505 service_->Init();
3506 3506
3507 // Extension should be installed despite blacklist. 3507 // Extension should be installed despite blacklist.
3508 ASSERT_EQ(1u, service_->extensions()->size()); 3508 ASSERT_EQ(1u, service_->extensions()->size());
3509 EXPECT_TRUE(service_->GetExtensionById(good0, false)); 3509 EXPECT_TRUE(service_->GetExtensionById(good0, false));
3510 3510
3511 // Poke external providers and make sure the extension is still present. 3511 // Poke external providers and make sure the extension is still present.
3512 service_->CheckForExternalUpdates(); 3512 service_->CheckForExternalUpdates();
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
5043 // Component extensions should work even when extensions are disabled. 5043 // Component extensions should work even when extensions are disabled.
5044 set_extensions_enabled(false); 5044 set_extensions_enabled(false);
5045 5045
5046 base::FilePath path = data_dir_ 5046 base::FilePath path = data_dir_
5047 .AppendASCII("good") 5047 .AppendASCII("good")
5048 .AppendASCII("Extensions") 5048 .AppendASCII("Extensions")
5049 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") 5049 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
5050 .AppendASCII("1.0.0.0"); 5050 .AppendASCII("1.0.0.0");
5051 5051
5052 std::string manifest; 5052 std::string manifest;
5053 ASSERT_TRUE(file_util::ReadFileToString( 5053 ASSERT_TRUE(base::ReadFileToString(
5054 path.Append(extensions::kManifestFilename), &manifest)); 5054 path.Append(extensions::kManifestFilename), &manifest));
5055 5055
5056 service_->component_loader()->Add(manifest, path); 5056 service_->component_loader()->Add(manifest, path);
5057 service_->Init(); 5057 service_->Init();
5058 5058
5059 // Note that we do not pump messages -- the extension should be loaded 5059 // Note that we do not pump messages -- the extension should be loaded
5060 // immediately. 5060 // immediately.
5061 5061
5062 EXPECT_EQ(0u, GetErrors().size()); 5062 EXPECT_EQ(0u, GetErrors().size());
5063 ASSERT_EQ(1u, loaded_.size()); 5063 ASSERT_EQ(1u, loaded_.size());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
5097 &flare_was_called, // Safe due to WeakPtrFactory scope. 5097 &flare_was_called, // Safe due to WeakPtrFactory scope.
5098 &triggered_type)); // Safe due to WeakPtrFactory scope. 5098 &triggered_type)); // Safe due to WeakPtrFactory scope.
5099 5099
5100 // Install a component extension. 5100 // Install a component extension.
5101 base::FilePath path = data_dir_ 5101 base::FilePath path = data_dir_
5102 .AppendASCII("good") 5102 .AppendASCII("good")
5103 .AppendASCII("Extensions") 5103 .AppendASCII("Extensions")
5104 .AppendASCII(good0) 5104 .AppendASCII(good0)
5105 .AppendASCII("1.0.0.0"); 5105 .AppendASCII("1.0.0.0");
5106 std::string manifest; 5106 std::string manifest;
5107 ASSERT_TRUE(file_util::ReadFileToString( 5107 ASSERT_TRUE(base::ReadFileToString(
5108 path.Append(extensions::kManifestFilename), &manifest)); 5108 path.Append(extensions::kManifestFilename), &manifest));
5109 service_->component_loader()->Add(manifest, path); 5109 service_->component_loader()->Add(manifest, path);
5110 ASSERT_FALSE(service_->is_ready()); 5110 ASSERT_FALSE(service_->is_ready());
5111 service_->Init(); 5111 service_->Init();
5112 ASSERT_TRUE(service_->is_ready()); 5112 ASSERT_TRUE(service_->is_ready());
5113 5113
5114 // Extensions added before service is_ready() don't trigger sync startup. 5114 // Extensions added before service is_ready() don't trigger sync startup.
5115 EXPECT_FALSE(flare_was_called); 5115 EXPECT_FALSE(flare_was_called);
5116 ASSERT_EQ(syncer::UNSPECIFIED, triggered_type); 5116 ASSERT_EQ(syncer::UNSPECIFIED, triggered_type);
5117 } 5117 }
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
6370 EXPECT_TRUE(notifications.CheckNotifications( 6370 EXPECT_TRUE(notifications.CheckNotifications(
6371 chrome::NOTIFICATION_EXTENSION_INSTALLED)); 6371 chrome::NOTIFICATION_EXTENSION_INSTALLED));
6372 6372
6373 EXPECT_TRUE(service_->GetInstalledExtension(id)); 6373 EXPECT_TRUE(service_->GetInstalledExtension(id));
6374 EXPECT_FALSE(service_->extensions()->Contains(id)); 6374 EXPECT_FALSE(service_->extensions()->Contains(id));
6375 EXPECT_TRUE(service_->blacklisted_extensions()->Contains(id)); 6375 EXPECT_TRUE(service_->blacklisted_extensions()->Contains(id));
6376 EXPECT_TRUE(service_->extension_prefs()->IsExtensionBlacklisted(id)); 6376 EXPECT_TRUE(service_->extension_prefs()->IsExtensionBlacklisted(id));
6377 EXPECT_TRUE( 6377 EXPECT_TRUE(
6378 service_->extension_prefs()->IsBlacklistedExtensionAcknowledged(id)); 6378 service_->extension_prefs()->IsBlacklistedExtensionAcknowledged(id));
6379 } 6379 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698