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

Side by Side Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc

Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/manifest_handlers/settings_overrides_handler. h" 5 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler. h"
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/common/extensions/manifest_url_handler.h" 9 #include "chrome/common/extensions/manifest_url_handler.h"
10 #include "extensions/common/error_utils.h" 10 #include "extensions/common/error_utils.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 std::string error; 78 std::string error;
79 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); 79 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
80 ASSERT_TRUE(root); 80 ASSERT_TRUE(root);
81 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 81 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
82 scoped_refptr<Extension> extension = Extension::Create( 82 scoped_refptr<Extension> extension = Extension::Create(
83 base::FilePath(FILE_PATH_LITERAL("//nonexistent")), 83 base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
84 Manifest::INVALID_LOCATION, 84 Manifest::INVALID_LOCATION,
85 *static_cast<base::DictionaryValue*>(root.get()), 85 *static_cast<base::DictionaryValue*>(root.get()),
86 Extension::NO_FLAGS, 86 Extension::NO_FLAGS,
87 &error); 87 &error);
88 ASSERT_TRUE(extension); 88 ASSERT_TRUE(extension.get());
89 #if defined(OS_WIN) 89 #if defined(OS_WIN)
90 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride)); 90 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
91 91
92 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>( 92 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>(
93 extension->GetManifestData(manifest_keys::kSettingsOverride)); 93 extension->GetManifestData(manifest_keys::kSettingsOverride));
94 ASSERT_TRUE(settings_override); 94 ASSERT_TRUE(settings_override);
95 ASSERT_TRUE(settings_override->search_engine); 95 ASSERT_TRUE(settings_override->search_engine);
96 EXPECT_TRUE(settings_override->search_engine->is_default); 96 EXPECT_TRUE(settings_override->search_engine->is_default);
97 const ChromeSettingsOverrides::Search_provider* search_engine = 97 const ChromeSettingsOverrides::Search_provider* search_engine =
98 settings_override->search_engine.get(); 98 settings_override->search_engine.get();
(...skipping 22 matching lines...) Expand all
121 std::string error; 121 std::string error;
122 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); 122 scoped_ptr<base::Value> root(json.Deserialize(NULL, &error));
123 ASSERT_TRUE(root); 123 ASSERT_TRUE(root);
124 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); 124 ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY));
125 scoped_refptr<Extension> extension = 125 scoped_refptr<Extension> extension =
126 Extension::Create(base::FilePath(FILE_PATH_LITERAL("//nonexistent")), 126 Extension::Create(base::FilePath(FILE_PATH_LITERAL("//nonexistent")),
127 Manifest::INVALID_LOCATION, 127 Manifest::INVALID_LOCATION,
128 *static_cast<base::DictionaryValue*>(root.get()), 128 *static_cast<base::DictionaryValue*>(root.get()),
129 Extension::NO_FLAGS, 129 Extension::NO_FLAGS,
130 &error); 130 &error);
131 ASSERT_TRUE(extension); 131 ASSERT_TRUE(extension.get());
132 #if defined(OS_WIN) 132 #if defined(OS_WIN)
133 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride)); 133 ASSERT_TRUE(extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
134 134
135 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>( 135 SettingsOverrides* settings_override = static_cast<SettingsOverrides*>(
136 extension->GetManifestData(manifest_keys::kSettingsOverride)); 136 extension->GetManifestData(manifest_keys::kSettingsOverride));
137 ASSERT_TRUE(settings_override); 137 ASSERT_TRUE(settings_override);
138 ASSERT_TRUE(settings_override->search_engine); 138 ASSERT_TRUE(settings_override->search_engine);
139 EXPECT_TRUE(settings_override->search_engine->is_default); 139 EXPECT_TRUE(settings_override->search_engine->is_default);
140 const ChromeSettingsOverrides::Search_provider* search_engine = 140 const ChromeSettingsOverrides::Search_provider* search_engine =
141 settings_override->search_engine.get(); 141 settings_override->search_engine.get();
(...skipping 20 matching lines...) Expand all
162 Extension::NO_FLAGS, 162 Extension::NO_FLAGS,
163 &error); 163 &error);
164 #if defined(OS_WIN) 164 #if defined(OS_WIN)
165 EXPECT_FALSE(extension); 165 EXPECT_FALSE(extension);
166 EXPECT_EQ( 166 EXPECT_EQ(
167 extensions::ErrorUtils::FormatErrorMessage( 167 extensions::ErrorUtils::FormatErrorMessage(
168 extensions::manifest_errors::kInvalidEmptyDictionary, 168 extensions::manifest_errors::kInvalidEmptyDictionary,
169 extensions::manifest_keys::kSettingsOverride), 169 extensions::manifest_keys::kSettingsOverride),
170 error); 170 error);
171 #else 171 #else
172 EXPECT_TRUE(extension); 172 EXPECT_TRUE(extension.get());
173 EXPECT_FALSE( 173 EXPECT_FALSE(
174 extension->manifest()->HasPath(manifest_keys::kSettingsOverride)); 174 extension->manifest()->HasPath(manifest_keys::kSettingsOverride));
175 #endif 175 #endif
176 } 176 }
177 177
178 } // namespace 178 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698