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

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

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 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) 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 <algorithm> 5 #include <algorithm>
6 #include <set> 6 #include <set>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 installer->set_allow_silent_install(true); 1799 installer->set_allow_silent_install(true);
1800 installer->InstallUserScript( 1800 installer->InstallUserScript(
1801 path, 1801 path,
1802 GURL("http://www.aaronboodman.com/scripts/user_script_basic.user.js")); 1802 GURL("http://www.aaronboodman.com/scripts/user_script_basic.user.js"));
1803 1803
1804 base::RunLoop().RunUntilIdle(); 1804 base::RunLoop().RunUntilIdle();
1805 std::vector<base::string16> errors = GetErrors(); 1805 std::vector<base::string16> errors = GetErrors();
1806 EXPECT_TRUE(installed_) << "Nothing was installed."; 1806 EXPECT_TRUE(installed_) << "Nothing was installed.";
1807 EXPECT_FALSE(was_update_) << path.value(); 1807 EXPECT_FALSE(was_update_) << path.value();
1808 ASSERT_EQ(1u, loaded_.size()) << "Nothing was loaded."; 1808 ASSERT_EQ(1u, loaded_.size()) << "Nothing was loaded.";
1809 EXPECT_EQ(0u, errors.size()) << "There were errors: " 1809 EXPECT_EQ(0u, errors.size())
1810 << JoinString(errors, ','); 1810 << "There were errors: "
1811 << base::JoinString(errors, base::ASCIIToUTF16(","));
1811 EXPECT_TRUE(service()->GetExtensionById(loaded_[0]->id(), false)) 1812 EXPECT_TRUE(service()->GetExtensionById(loaded_[0]->id(), false))
1812 << path.value(); 1813 << path.value();
1813 1814
1814 installed_ = NULL; 1815 installed_ = NULL;
1815 was_update_ = false; 1816 was_update_ = false;
1816 loaded_.clear(); 1817 loaded_.clear();
1817 ExtensionErrorReporter::GetInstance()->ClearErrors(); 1818 ExtensionErrorReporter::GetInstance()->ClearErrors();
1818 } 1819 }
1819 1820
1820 // Extensions don't install during shutdown. 1821 // Extensions don't install during shutdown.
(...skipping 6280 matching lines...) Expand 10 before | Expand all | Expand 10 after
8101 8102
8102 service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED, 8103 service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
8103 content::Source<Profile>(profile()), 8104 content::Source<Profile>(profile()),
8104 content::NotificationService::NoDetails()); 8105 content::NotificationService::NoDetails());
8105 EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_); 8106 EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
8106 EXPECT_EQ(0u, registry()->enabled_extensions().size()); 8107 EXPECT_EQ(0u, registry()->enabled_extensions().size());
8107 EXPECT_EQ(0u, registry()->disabled_extensions().size()); 8108 EXPECT_EQ(0u, registry()->disabled_extensions().size());
8108 EXPECT_EQ(0u, registry()->terminated_extensions().size()); 8109 EXPECT_EQ(0u, registry()->terminated_extensions().size());
8109 EXPECT_EQ(0u, registry()->blacklisted_extensions().size()); 8110 EXPECT_EQ(0u, registry()->blacklisted_extensions().size());
8110 } 8111 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698