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

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

Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 "chrome/browser/extensions/extension_service_unittest.h" 5 #include "chrome/browser/extensions/extension_service_unittest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_util.h" 14 #include "base/file_util.h"
15 #include "base/json/json_file_value_serializer.h"
15 #include "base/json/json_reader.h" 16 #include "base/json/json_reader.h"
16 #include "base/json/json_value_serializer.h" 17 #include "base/json/json_string_value_serializer.h"
17 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
18 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
19 #include "base/message_loop.h" 20 #include "base/message_loop.h"
20 #include "base/path_service.h" 21 #include "base/path_service.h"
21 #include "base/scoped_temp_dir.h" 22 #include "base/scoped_temp_dir.h"
22 #include "base/stl_util.h" 23 #include "base/stl_util.h"
23 #include "base/string16.h" 24 #include "base/string16.h"
24 #include "base/string_number_conversions.h" 25 #include "base/string_number_conversions.h"
25 #include "base/string_util.h" 26 #include "base/string_util.h"
26 #include "base/utf_string_conversions.h" 27 #include "base/utf_string_conversions.h"
(...skipping 4757 matching lines...) Expand 10 before | Expand all | Expand 10 after
4784 ASSERT_FALSE(AddPendingSyncInstall()); 4785 ASSERT_FALSE(AddPendingSyncInstall());
4785 4786
4786 // Wait for the external source to install. 4787 // Wait for the external source to install.
4787 WaitForCrxInstall(crx_path_, INSTALL_NEW); 4788 WaitForCrxInstall(crx_path_, INSTALL_NEW);
4788 ASSERT_TRUE(IsCrxInstalled()); 4789 ASSERT_TRUE(IsCrxInstalled());
4789 4790
4790 // Now that the extension is installed, sync request should fail 4791 // Now that the extension is installed, sync request should fail
4791 // because the extension is already installed. 4792 // because the extension is already installed.
4792 ASSERT_FALSE(AddPendingSyncInstall()); 4793 ASSERT_FALSE(AddPendingSyncInstall());
4793 } 4794 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_info_map_unittest.cc ('k') | chrome/browser/extensions/extension_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698