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

Side by Side Diff: extensions/browser/extension_protocols_unittest.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 //#include "chrome/common/url_constants.h" 13 //#include "chrome/common/url_constants.h"
14 #include "content/public/browser/resource_request_info.h" 14 #include "content/public/browser/resource_request_info.h"
15 #include "content/public/test/mock_resource_context.h" 15 #include "content/public/test/mock_resource_context.h"
16 #include "content/public/test/test_browser_thread_bundle.h" 16 #include "content/public/test/test_browser_thread_bundle.h"
17 #include "extensions/browser/extension_protocols.h" 17 #include "extensions/browser/extension_protocols.h"
18 #include "extensions/browser/info_map.h" 18 #include "extensions/browser/info_map.h"
19 #include "extensions/common/constants.h" 19 #include "extensions/common/constants.h"
20 #include "extensions/common/extension.h" 20 #include "extensions/common/extension.h"
21 #include "net/base/request_priority.h" 21 #include "net/base/request_priority.h"
22 #include "net/url_request/url_request.h" 22 #include "net/url_request/url_request.h"
23 #include "net/url_request/url_request_job_factory_impl.h" 23 #include "net/url_request/url_request_job_factory_impl.h"
24 #include "net/url_request/url_request_status.h" 24 #include "net/url_request/url_request_status.h"
25 #include "net/url_request/url_request_test_util.h" 25 #include "net/url_request/url_request_test_util.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 27
28 using content::ResourceType;
29
28 namespace extensions { 30 namespace extensions {
29 31
30 scoped_refptr<Extension> CreateTestExtension(const std::string& name, 32 scoped_refptr<Extension> CreateTestExtension(const std::string& name,
31 bool incognito_split_mode) { 33 bool incognito_split_mode) {
32 base::DictionaryValue manifest; 34 base::DictionaryValue manifest;
33 manifest.SetString("name", name); 35 manifest.SetString("name", name);
34 manifest.SetString("version", "1"); 36 manifest.SetString("version", "1");
35 manifest.SetInteger("manifest_version", 2); 37 manifest.SetInteger("manifest_version", 2);
36 manifest.SetString("incognito", incognito_split_mode ? "split" : "spanning"); 38 manifest.SetString("incognito", incognito_split_mode ? "split" : "spanning");
37 39
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 net::URLRequest request(extension->GetResourceURL("test.dat"), 333 net::URLRequest request(extension->GetResourceURL("test.dat"),
332 net::DEFAULT_PRIORITY, 334 net::DEFAULT_PRIORITY,
333 &test_delegate_, 335 &test_delegate_,
334 resource_context_.GetRequestContext()); 336 resource_context_.GetRequestContext());
335 StartRequest(&request, ResourceType::MEDIA); 337 StartRequest(&request, ResourceType::MEDIA);
336 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); 338 EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
337 } 339 }
338 } 340 }
339 341
340 } // namespace extensions 342 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698