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

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: rebase again Created 7 years, 6 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 !field.IsAtEnd(); field.Advance()) { 111 !field.IsAtEnd(); field.Advance()) {
112 const Value* expected_value = &field.value(); 112 const Value* expected_value = &field.value();
113 Value* actual_value = NULL; 113 Value* actual_value = NULL;
114 EXPECT_TRUE(actual_output_data->Get(field.key(), &actual_value)) << 114 EXPECT_TRUE(actual_output_data->Get(field.key(), &actual_value)) <<
115 field.key() + " is missing" + paths_details; 115 field.key() + " is missing" + paths_details;
116 EXPECT_TRUE(expected_value->Equals(actual_value)) << field.key() + 116 EXPECT_TRUE(expected_value->Equals(actual_value)) << field.key() +
117 paths_details; 117 paths_details;
118 } 118 }
119 } 119 }
120 120
121 MessageLoop message_loop_; 121 base::MessageLoop message_loop_;
122 content::TestBrowserThread ui_thread_; 122 content::TestBrowserThread ui_thread_;
123 content::TestBrowserThread file_thread_; 123 content::TestBrowserThread file_thread_;
124 scoped_ptr<TestingProfile> profile_; 124 scoped_ptr<TestingProfile> profile_;
125 ExtensionService* extension_service_; 125 ExtensionService* extension_service_;
126 extensions::ManagementPolicy* management_policy_; 126 extensions::ManagementPolicy* management_policy_;
127 scoped_ptr<ExtensionSettingsHandler> handler_; 127 scoped_ptr<ExtensionSettingsHandler> handler_;
128 128
129 #if defined OS_CHROMEOS 129 #if defined OS_CHROMEOS
130 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; 130 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
131 chromeos::ScopedTestCrosSettings test_cros_settings_; 131 chromeos::ScopedTestCrosSettings test_cros_settings_;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 scoped_ptr<DictionaryValue> extension_details( 273 scoped_ptr<DictionaryValue> extension_details(
274 CreateExtensionDetailViewFromPath( 274 CreateExtensionDetailViewFromPath(
275 extension_path, pages, Manifest::UNPACKED)); 275 extension_path, pages, Manifest::UNPACKED));
276 276
277 base::FilePath::StringType ui_path; 277 base::FilePath::StringType ui_path;
278 278
279 EXPECT_TRUE(extension_details->GetString("path", &ui_path)); 279 EXPECT_TRUE(extension_details->GetString("path", &ui_path));
280 EXPECT_EQ(extension_path, base::FilePath(ui_path)); 280 EXPECT_EQ(extension_path, base::FilePath(ui_path));
281 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_test_message_listener.cc ('k') | chrome/browser/extensions/extension_uninstall_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698