OLD | NEW |
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_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 #include "chrome/browser/extensions/extension_host.h" | 6 #include "chrome/browser/extensions/extension_host.h" |
7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
8 #include "chrome/browser/extensions/extension_system.h" | 8 #include "chrome/browser/extensions/extension_system.h" |
9 #include "chrome/browser/extensions/process_map.h" | 9 #include "chrome/browser/extensions/process_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 extensions::ProcessMap* process_map = service->process_map(); | 274 extensions::ProcessMap* process_map = service->process_map(); |
275 | 275 |
276 host_resolver()->AddRule("*", "127.0.0.1"); | 276 host_resolver()->AddRule("*", "127.0.0.1"); |
277 ASSERT_TRUE(test_server()->Start()); | 277 ASSERT_TRUE(test_server()->Start()); |
278 GURL base_url = GetTestBaseURL("app_process"); | 278 GURL base_url = GetTestBaseURL("app_process"); |
279 | 279 |
280 // Load an app as a bookmark app. | 280 // Load an app as a bookmark app. |
281 std::string error; | 281 std::string error; |
282 scoped_refptr<const Extension> extension(extension_file_util::LoadExtension( | 282 scoped_refptr<const Extension> extension(extension_file_util::LoadExtension( |
283 test_data_dir_.AppendASCII("app_process"), | 283 test_data_dir_.AppendASCII("app_process"), |
284 Extension::LOAD, | 284 extensions::Manifest::LOAD, |
285 Extension::FROM_BOOKMARK, | 285 Extension::FROM_BOOKMARK, |
286 &error)); | 286 &error)); |
287 service->OnExtensionInstalled(extension, | 287 service->OnExtensionInstalled(extension, |
288 syncer::StringOrdinal::CreateInitialOrdinal(), | 288 syncer::StringOrdinal::CreateInitialOrdinal(), |
289 false /* no requirement errors */, | 289 false /* no requirement errors */, |
290 false /* don't wait for idle */); | 290 false /* don't wait for idle */); |
291 ASSERT_TRUE(extension.get()); | 291 ASSERT_TRUE(extension.get()); |
292 ASSERT_TRUE(extension->from_bookmark()); | 292 ASSERT_TRUE(extension->from_bookmark()); |
293 | 293 |
294 // Test both opening a URL in a new tab, and opening a tab and then navigating | 294 // Test both opening a URL in a new tab, and opening a tab and then navigating |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
663 &browser()->tab_strip_model()->GetActiveWebContents()-> | 663 &browser()->tab_strip_model()->GetActiveWebContents()-> |
664 GetController())); | 664 GetController())); |
665 chrome::Reload(browser(), CURRENT_TAB); | 665 chrome::Reload(browser(), CURRENT_TAB); |
666 observer.Wait(); | 666 observer.Wait(); |
667 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( | 667 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
668 contents, | 668 contents, |
669 "window.domAutomationController.send(chrome.app.isInstalled)", | 669 "window.domAutomationController.send(chrome.app.isInstalled)", |
670 &is_installed)); | 670 &is_installed)); |
671 ASSERT_TRUE(is_installed); | 671 ASSERT_TRUE(is_installed); |
672 } | 672 } |
OLD | NEW |