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

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

Issue 612423003: Move ExtensionCache to //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test setup Created 6 years, 2 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "chrome/browser/extensions/browsertest_util.h" 17 #include "chrome/browser/extensions/browsertest_util.h"
18 #include "chrome/browser/extensions/component_loader.h" 18 #include "chrome/browser/extensions/component_loader.h"
19 #include "chrome/browser/extensions/crx_installer.h" 19 #include "chrome/browser/extensions/crx_installer.h"
20 #include "chrome/browser/extensions/extension_creator.h" 20 #include "chrome/browser/extensions/extension_creator.h"
21 #include "chrome/browser/extensions/extension_error_reporter.h" 21 #include "chrome/browser/extensions/extension_error_reporter.h"
22 #include "chrome/browser/extensions/extension_install_prompt.h" 22 #include "chrome/browser/extensions/extension_install_prompt.h"
23 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
24 #include "chrome/browser/extensions/extension_util.h" 24 #include "chrome/browser/extensions/extension_util.h"
25 #include "chrome/browser/extensions/unpacked_installer.h" 25 #include "chrome/browser/extensions/unpacked_installer.h"
26 #include "chrome/browser/extensions/updater/extension_cache_fake.h" 26 #include "chrome/browser/extensions/updater/extension_cache_fake.h"
27 #include "chrome/browser/extensions/updater/extension_updater.h"
27 #include "chrome/browser/profiles/profile.h" 28 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/profiles/profile_manager.h" 29 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
30 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" 32 #include "chrome/browser/ui/tabs/tab_strip_model.h"
32 #include "chrome/common/chrome_paths.h" 33 #include "chrome/common/chrome_paths.h"
33 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/chrome_version_info.h" 35 #include "chrome/common/chrome_version_info.h"
35 #include "chrome/test/base/ui_test_utils.h" 36 #include "chrome/test/base/ui_test_utils.h"
36 #include "content/public/browser/navigation_controller.h" 37 #include "content/public/browser/navigation_controller.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 126 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
126 "TestUser@gmail.com"); 127 "TestUser@gmail.com");
127 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 128 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
128 } 129 }
129 #endif 130 #endif
130 } 131 }
131 132
132 void ExtensionBrowserTest::SetUpOnMainThread() { 133 void ExtensionBrowserTest::SetUpOnMainThread() {
133 InProcessBrowserTest::SetUpOnMainThread(); 134 InProcessBrowserTest::SetUpOnMainThread();
134 observer_.reset(new ExtensionTestNotificationObserver(browser())); 135 observer_.reset(new ExtensionTestNotificationObserver(browser()));
136 if (extension_service()->updater()) {
137 extension_service()->updater()->SetExtensionCacheForTesting(
138 test_extension_cache_.get());
139 }
135 } 140 }
136 141
137 const Extension* ExtensionBrowserTest::LoadExtension( 142 const Extension* ExtensionBrowserTest::LoadExtension(
138 const base::FilePath& path) { 143 const base::FilePath& path) {
139 return LoadExtensionWithFlags(path, kFlagEnableFileAccess); 144 return LoadExtensionWithFlags(path, kFlagEnableFileAccess);
140 } 145 }
141 146
142 const Extension* ExtensionBrowserTest::LoadExtensionIncognito( 147 const Extension* ExtensionBrowserTest::LoadExtensionIncognito(
143 const base::FilePath& path) { 148 const base::FilePath& path) {
144 return LoadExtensionWithFlags(path, 149 return LoadExtensionWithFlags(path,
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( 657 return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
653 profile(), extension_id, script); 658 profile(), extension_id, script);
654 } 659 }
655 660
656 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( 661 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
657 const std::string& extension_id, 662 const std::string& extension_id,
658 const std::string& script) { 663 const std::string& script) {
659 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( 664 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
660 profile(), extension_id, script); 665 profile(), extension_id, script);
661 } 666 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698