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

Side by Side Diff: chrome/common/extensions/extension_unittest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/extensions/extension.h" 5 #include "chrome/common/extensions/extension.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/common/extensions/manifest.h" 24 #include "chrome/common/extensions/manifest.h"
25 #include "chrome/common/extensions/manifest_handler.h" 25 #include "chrome/common/extensions/manifest_handler.h"
26 #include "chrome/common/extensions/permissions/api_permission.h" 26 #include "chrome/common/extensions/permissions/api_permission.h"
27 #include "chrome/common/extensions/permissions/permission_set.h" 27 #include "chrome/common/extensions/permissions/permission_set.h"
28 #include "chrome/common/extensions/permissions/socket_permission.h" 28 #include "chrome/common/extensions/permissions/socket_permission.h"
29 #include "chrome/common/extensions/permissions/usb_device_permission.h" 29 #include "chrome/common/extensions/permissions/usb_device_permission.h"
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "extensions/common/error_utils.h" 31 #include "extensions/common/error_utils.h"
32 #include "googleurl/src/gurl.h" 32 #include "googleurl/src/gurl.h"
33 #include "net/base/mime_sniffer.h" 33 #include "net/base/mime_sniffer.h"
34 #include "net/base/mock_host_resolver.h" 34 #include "net/dns/mock_host_resolver.h"
35 #include "skia/ext/image_operations.h" 35 #include "skia/ext/image_operations.h"
36 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
37 #include "third_party/skia/include/core/SkBitmap.h" 37 #include "third_party/skia/include/core/SkBitmap.h"
38 #include "ui/gfx/codec/png_codec.h" 38 #include "ui/gfx/codec/png_codec.h"
39 39
40 using content::SocketPermissionRequest; 40 using content::SocketPermissionRequest;
41 41
42 namespace keys = extension_manifest_keys; 42 namespace keys = extension_manifest_keys;
43 namespace values = extension_manifest_values; 43 namespace values = extension_manifest_values;
44 namespace errors = extension_manifest_errors; 44 namespace errors = extension_manifest_errors;
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 scoped_refptr<Extension> extension( 1088 scoped_refptr<Extension> extension(
1089 MakeSyncTestExtension(EXTENSION, GURL(), GURL(), 1089 MakeSyncTestExtension(EXTENSION, GURL(), GURL(),
1090 Manifest::INTERNAL, 2, base::FilePath(), 1090 Manifest::INTERNAL, 2, base::FilePath(),
1091 Extension::NO_FLAGS)); 1091 Extension::NO_FLAGS));
1092 if (extension) 1092 if (extension)
1093 EXPECT_EQ(extension->GetSyncType(), Extension::SYNC_TYPE_NONE); 1093 EXPECT_EQ(extension->GetSyncType(), Extension::SYNC_TYPE_NONE);
1094 } 1094 }
1095 #endif // !defined(OS_CHROMEOS) 1095 #endif // !defined(OS_CHROMEOS)
1096 1096
1097 } // namespace extensions 1097 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698