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

Side by Side Diff: chrome/browser/apps/drive/drive_app_converter_browsertest.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/apps/drive/drive_app_converter.h" 5 #include "chrome/browser/apps/drive/drive_app_converter.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 12 #include "base/path_service.h"
12 #include "base/version.h" 13 #include "base/version.h"
13 #include "chrome/browser/extensions/extension_browsertest.h" 14 #include "chrome/browser/extensions/extension_browsertest.h"
14 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_util.h" 16 #include "chrome/browser/extensions/extension_util.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/extensions/extension_constants.h" 18 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 19 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
19 #include "content/public/test/test_utils.h" 20 #include "content/public/test/test_utils.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 InstallAndWaitFinish(GetTestDriveApp()); 155 InstallAndWaitFinish(GetTestDriveApp());
155 const Extension* second_install = converter()->extension(); 156 const Extension* second_install = converter()->extension();
156 ASSERT_TRUE(second_install != NULL); 157 ASSERT_TRUE(second_install != NULL);
157 EXPECT_FALSE(converter()->is_new_install()); 158 EXPECT_FALSE(converter()->is_new_install());
158 159
159 // Two different app instances. 160 // Two different app instances.
160 ASSERT_NE(first_install, second_install); 161 ASSERT_NE(first_install, second_install);
161 EXPECT_EQ(first_install_id, second_install->id()); 162 EXPECT_EQ(first_install_id, second_install->id());
162 EXPECT_GE(second_install->version()->CompareTo(first_install_version), 0); 163 EXPECT_GE(second_install->version()->CompareTo(first_install_version), 0);
163 } 164 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/drive/drive_app_converter.cc ('k') | chrome/browser/apps/drive/drive_app_mapping.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698