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

Side by Side Diff: chrome/browser/extensions/api/downloads/downloads_api_unittest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/scoped_temp_dir.h" 11 #include "base/scoped_temp_dir.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "chrome/browser/download/download_file_icon_extractor.h" 14 #include "chrome/browser/download/download_file_icon_extractor.h"
15 #include "chrome/browser/download/download_service.h" 15 #include "chrome/browser/download/download_service.h"
16 #include "chrome/browser/download/download_service_factory.h" 16 #include "chrome/browser/download/download_service_factory.h"
17 #include "chrome/browser/download/download_test_observer.h" 17 #include "chrome/browser/download/download_test_observer.h"
18 #include "chrome/browser/extensions/api/downloads/downloads_api.h" 18 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
19 #include "chrome/browser/extensions/extension_apitest.h" 19 #include "chrome/browser/extensions/extension_apitest.h"
20 #include "chrome/browser/extensions/extension_event_names.h" 20 #include "chrome/browser/extensions/extension_event_names.h"
21 #include "chrome/browser/extensions/extension_function_test_utils.h" 21 #include "chrome/browser/extensions/extension_function_test_utils.h"
22 #include "chrome/browser/net/url_request_mock_util.h" 22 #include "chrome/browser/net/url_request_mock_util.h"
23 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_tabstrip.h"
26 #include "chrome/browser/ui/tab_contents/tab_contents.h" 27 #include "chrome/browser/ui/tab_contents/tab_contents.h"
27 #include "chrome/common/chrome_notification_types.h" 28 #include "chrome/common/chrome_notification_types.h"
28 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
29 #include "chrome/test/base/in_process_browser_test.h" 30 #include "chrome/test/base/in_process_browser_test.h"
30 #include "chrome/test/base/ui_test_utils.h" 31 #include "chrome/test/base/ui_test_utils.h"
31 #include "content/public/browser/browser_context.h" 32 #include "content/public/browser/browser_context.h"
32 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
33 #include "content/public/browser/download_item.h" 34 #include "content/public/browser/download_item.h"
34 #include "content/public/browser/download_manager.h" 35 #include "content/public/browser/download_manager.h"
35 #include "content/public/browser/download_persistent_store_info.h" 36 #include "content/public/browser/download_persistent_store_info.h"
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 const FilePath& downloads_directory() { 546 const FilePath& downloads_directory() {
546 return downloads_directory_.path(); 547 return downloads_directory_.path();
547 } 548 }
548 549
549 DownloadsEventsListener* events_listener() { return events_listener_.get(); } 550 DownloadsEventsListener* events_listener() { return events_listener_.get(); }
550 551
551 private: 552 private:
552 void SetUpExtensionFunction(UIThreadExtensionFunction* function) { 553 void SetUpExtensionFunction(UIThreadExtensionFunction* function) {
553 if (extension_) { 554 if (extension_) {
554 // Recreate the tab each time for insulation. 555 // Recreate the tab each time for insulation.
555 TabContents* tab = current_browser()->AddSelectedTabWithURL( 556 TabContents* tab = chrome::AddSelectedTabWithURL(
557 current_browser(),
556 extension_->GetResourceURL("empty.html"), 558 extension_->GetResourceURL("empty.html"),
557 content::PAGE_TRANSITION_LINK); 559 content::PAGE_TRANSITION_LINK);
558 function->set_extension(extension_); 560 function->set_extension(extension_);
559 function->SetRenderViewHost(tab->web_contents()->GetRenderViewHost()); 561 function->SetRenderViewHost(tab->web_contents()->GetRenderViewHost());
560 } 562 }
561 } 563 }
562 564
563 void CreateAndSetDownloadsDirectory() { 565 void CreateAndSetDownloadsDirectory() {
564 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir()); 566 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir());
565 current_browser()->profile()->GetPrefs()->SetFilePath( 567 current_browser()->profile()->GetPrefs()->SetFilePath(
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after
2149 " \"state\": {" 2151 " \"state\": {"
2150 " \"previous\": \"in_progress\"," 2152 " \"previous\": \"in_progress\","
2151 " \"current\": \"complete\"}}]", 2153 " \"current\": \"complete\"}}]",
2152 result_id, 2154 result_id,
2153 GetFilename("on_record.txt.crdownload").c_str(), 2155 GetFilename("on_record.txt.crdownload").c_str(),
2154 GetFilename("on_record.txt").c_str()))); 2156 GetFilename("on_record.txt").c_str())));
2155 std::string disk_data; 2157 std::string disk_data;
2156 EXPECT_TRUE(file_util::ReadFileToString(item->GetFullPath(), &disk_data)); 2158 EXPECT_TRUE(file_util::ReadFileToString(item->GetFullPath(), &disk_data));
2157 EXPECT_STREQ(kPayloadData, disk_data.c_str()); 2159 EXPECT_STREQ(kPayloadData, disk_data.c_str());
2158 } 2160 }
OLDNEW
« no previous file with comments | « chrome/browser/errorpage_browsertest.cc ('k') | chrome/browser/extensions/api/extension_action/browser_action_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698