| Index: chrome/browser/extensions/extension_browsertests_misc.cc
|
| diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
|
| index f554d11ed4d3a5b04193aa84eb02a0d32a1f80a6..3af1ea6807182484d67327e4374a214b52a3aec8 100644
|
| --- a/chrome/browser/extensions/extension_browsertests_misc.cc
|
| +++ b/chrome/browser/extensions/extension_browsertests_misc.cc
|
| @@ -13,7 +13,7 @@
|
| #include "chrome/browser/extensions/extension_host.h"
|
| #include "chrome/browser/extensions/extension_process_manager.h"
|
| #include "chrome/browser/extensions/extension_tabs_module.h"
|
| -#include "chrome/browser/extensions/extensions_service.h"
|
| +#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_updater.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/renderer_host/render_view_host.h"
|
| @@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) {
|
| IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) {
|
| base::TimeTicks start_time = base::TimeTicks::Now();
|
|
|
| - ExtensionsService* service = browser()->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser()->profile()->GetExtensionService();
|
|
|
| size_t size_before = service->extensions()->size();
|
|
|
| @@ -338,7 +338,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) {
|
| // Tests that tooltips of a browser action icon can be specified using UTF8.
|
| // See http://crbug.com/25349.
|
| IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
|
| - ExtensionsService* service = browser()->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser()->profile()->GetExtensionService();
|
| const size_t size_before = service->extensions()->size();
|
| FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
|
| .AppendASCII("title_localized"));
|
| @@ -361,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
|
| IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) {
|
| ASSERT_TRUE(test_server()->Start());
|
|
|
| - ExtensionsService* service = browser()->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser()->profile()->GetExtensionService();
|
| const size_t size_before = service->extensions()->size();
|
|
|
| FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
|
| @@ -460,7 +460,7 @@ void NavigateToFeedAndValidate(net::TestServer* server,
|
| // TODO(finnur): Implement this is a non-flaky way.
|
| }
|
|
|
| - ExtensionsService* service = browser->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser->profile()->GetExtensionService();
|
| const Extension* extension = service->extensions()->back();
|
| std::string id = extension->id();
|
|
|
| @@ -762,7 +762,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
|
| tab->render_view_host(), L"", L"testPluginWorks()", &result));
|
| EXPECT_FALSE(result);
|
|
|
| - ExtensionsService* service = browser()->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser()->profile()->GetExtensionService();
|
| const size_t size_before = service->extensions()->size();
|
| ASSERT_TRUE(LoadExtension(extension_dir));
|
| EXPECT_EQ(size_before + 1, service->extensions()->size());
|
| @@ -814,7 +814,7 @@ static const wchar_t* jscript_click_option_button =
|
| IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) {
|
| // Install an extension with an options page.
|
| ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("options.crx"), 1));
|
| - ExtensionsService* service = browser()->profile()->GetExtensionsService();
|
| + ExtensionService* service = browser()->profile()->GetExtensionService();
|
| const ExtensionList* extensions = service->extensions();
|
| ASSERT_EQ(1u, extensions->size());
|
| const Extension* extension = extensions->at(0);
|
|
|