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

Side by Side Diff: chrome/browser/extensions/extension_ui_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_file_value_serializer.h" 6 #include "base/json/json_file_value_serializer.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 !field.IsAtEnd(); field.Advance()) { 118 !field.IsAtEnd(); field.Advance()) {
119 const Value* expected_value = &field.value(); 119 const Value* expected_value = &field.value();
120 Value* actual_value = NULL; 120 Value* actual_value = NULL;
121 EXPECT_TRUE(actual_output_data->Get(field.key(), &actual_value)) << 121 EXPECT_TRUE(actual_output_data->Get(field.key(), &actual_value)) <<
122 field.key() + " is missing" + paths_details; 122 field.key() + " is missing" + paths_details;
123 EXPECT_TRUE(expected_value->Equals(actual_value)) << field.key() + 123 EXPECT_TRUE(expected_value->Equals(actual_value)) << field.key() +
124 paths_details; 124 paths_details;
125 } 125 }
126 } 126 }
127 127
128 MessageLoop message_loop_; 128 base::MessageLoop message_loop_;
129 content::TestBrowserThread ui_thread_; 129 content::TestBrowserThread ui_thread_;
130 content::TestBrowserThread file_thread_; 130 content::TestBrowserThread file_thread_;
131 scoped_ptr<TestingProfile> profile_; 131 scoped_ptr<TestingProfile> profile_;
132 ExtensionService* extension_service_; 132 ExtensionService* extension_service_;
133 extensions::ManagementPolicy* management_policy_; 133 extensions::ManagementPolicy* management_policy_;
134 scoped_ptr<ExtensionSettingsHandler> handler_; 134 scoped_ptr<ExtensionSettingsHandler> handler_;
135 135
136 #if defined OS_CHROMEOS 136 #if defined OS_CHROMEOS
137 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; 137 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
138 chromeos::ScopedTestCrosSettings test_cros_settings_; 138 chromeos::ScopedTestCrosSettings test_cros_settings_;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 scoped_ptr<DictionaryValue> extension_details( 280 scoped_ptr<DictionaryValue> extension_details(
281 CreateExtensionDetailViewFromPath( 281 CreateExtensionDetailViewFromPath(
282 extension_path, pages, Manifest::UNPACKED)); 282 extension_path, pages, Manifest::UNPACKED));
283 283
284 base::FilePath::StringType ui_path; 284 base::FilePath::StringType ui_path;
285 285
286 EXPECT_TRUE(extension_details->GetString("path", &ui_path)); 286 EXPECT_TRUE(extension_details->GetString("path", &ui_path));
287 EXPECT_EQ(extension_path, base::FilePath(ui_path)); 287 EXPECT_EQ(extension_path, base::FilePath(ui_path));
288 } 288 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698