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

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

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 AddPattern(&expected_patterns, "https://*.google.com/*"); 1161 AddPattern(&expected_patterns, "https://*.google.com/*");
1162 const Extension* extension = loaded_[0]; 1162 const Extension* extension = loaded_[0];
1163 const extensions::UserScriptList& scripts = 1163 const extensions::UserScriptList& scripts =
1164 extensions::ContentScriptsInfo::GetContentScripts(extension); 1164 extensions::ContentScriptsInfo::GetContentScripts(extension);
1165 ASSERT_EQ(2u, scripts.size()); 1165 ASSERT_EQ(2u, scripts.size());
1166 EXPECT_EQ(expected_patterns, scripts[0].url_patterns()); 1166 EXPECT_EQ(expected_patterns, scripts[0].url_patterns());
1167 EXPECT_EQ(2u, scripts[0].js_scripts().size()); 1167 EXPECT_EQ(2u, scripts[0].js_scripts().size());
1168 ExtensionResource resource00(extension->id(), 1168 ExtensionResource resource00(extension->id(),
1169 scripts[0].js_scripts()[0].extension_root(), 1169 scripts[0].js_scripts()[0].extension_root(),
1170 scripts[0].js_scripts()[0].relative_path()); 1170 scripts[0].js_scripts()[0].relative_path());
1171 base::FilePath expected_path(extension->path().AppendASCII("script1.js")); 1171 base::FilePath expected_path(
1172 ASSERT_TRUE(file_util::AbsolutePath(&expected_path)); 1172 extension->path().AppendASCII("script1.js")).AsAbsolute();
1173 EXPECT_TRUE(resource00.ComparePathWithDefault(expected_path)); 1173 EXPECT_TRUE(resource00.ComparePathWithDefault(expected_path));
1174 ExtensionResource resource01(extension->id(), 1174 ExtensionResource resource01(extension->id(),
1175 scripts[0].js_scripts()[1].extension_root(), 1175 scripts[0].js_scripts()[1].extension_root(),
1176 scripts[0].js_scripts()[1].relative_path()); 1176 scripts[0].js_scripts()[1].relative_path());
1177 expected_path = extension->path().AppendASCII("script2.js"); 1177 expected_path = extension->path().AppendASCII("script2.js").AsAbsolute();
1178 ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
1179 EXPECT_TRUE(resource01.ComparePathWithDefault(expected_path)); 1178 EXPECT_TRUE(resource01.ComparePathWithDefault(expected_path));
1180 EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(extension)); 1179 EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(extension));
1181 EXPECT_EQ(1u, scripts[1].url_patterns().patterns().size()); 1180 EXPECT_EQ(1u, scripts[1].url_patterns().patterns().size());
1182 EXPECT_EQ("http://*.news.com/*", 1181 EXPECT_EQ("http://*.news.com/*",
1183 scripts[1].url_patterns().begin()->GetAsString()); 1182 scripts[1].url_patterns().begin()->GetAsString());
1184 ExtensionResource resource10(extension->id(), 1183 ExtensionResource resource10(extension->id(),
1185 scripts[1].js_scripts()[0].extension_root(), 1184 scripts[1].js_scripts()[0].extension_root(),
1186 scripts[1].js_scripts()[0].relative_path()); 1185 scripts[1].js_scripts()[0].relative_path());
1187 expected_path = 1186 expected_path =
1188 extension->path().AppendASCII("js_files").AppendASCII("script3.js"); 1187 extension->path().AppendASCII("js_files").AppendASCII("script3.js");
1189 ASSERT_TRUE(file_util::AbsolutePath(&expected_path)); 1188 expected_path = expected_path.AsAbsolute();
1190 EXPECT_TRUE(resource10.ComparePathWithDefault(expected_path)); 1189 EXPECT_TRUE(resource10.ComparePathWithDefault(expected_path));
1191 1190
1192 expected_patterns.ClearPatterns(); 1191 expected_patterns.ClearPatterns();
1193 AddPattern(&expected_patterns, "http://*.google.com/*"); 1192 AddPattern(&expected_patterns, "http://*.google.com/*");
1194 AddPattern(&expected_patterns, "https://*.google.com/*"); 1193 AddPattern(&expected_patterns, "https://*.google.com/*");
1195 EXPECT_EQ(expected_patterns, 1194 EXPECT_EQ(expected_patterns,
1196 extension->GetActivePermissions()->explicit_hosts()); 1195 extension->GetActivePermissions()->explicit_hosts());
1197 1196
1198 EXPECT_EQ(std::string(good1), loaded_[1]->id()); 1197 EXPECT_EQ(std::string(good1), loaded_[1]->id());
1199 EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name()); 1198 EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name());
(...skipping 4706 matching lines...) Expand 10 before | Expand all | Expand 10 after
5906 EXPECT_FALSE(extensions::HasExternalInstallError(service_)); 5905 EXPECT_FALSE(extensions::HasExternalInstallError(service_));
5907 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); 5906 EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
5908 EXPECT_TRUE(service_->IsExtensionEnabled(page_action)); 5907 EXPECT_TRUE(service_->IsExtensionEnabled(page_action));
5909 5908
5910 ExtensionPrefs* prefs = service_->extension_prefs(); 5909 ExtensionPrefs* prefs = service_->extension_prefs();
5911 EXPECT_NE(0, prefs->GetDisableReasons(good_crx) & 5910 EXPECT_NE(0, prefs->GetDisableReasons(good_crx) &
5912 Extension::DISABLE_SIDELOAD_WIPEOUT); 5911 Extension::DISABLE_SIDELOAD_WIPEOUT);
5913 EXPECT_EQ(0, prefs->GetDisableReasons(page_action) & 5912 EXPECT_EQ(0, prefs->GetDisableReasons(page_action) &
5914 Extension::DISABLE_SIDELOAD_WIPEOUT); 5913 Extension::DISABLE_SIDELOAD_WIPEOUT);
5915 } 5914 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698