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

Side by Side Diff: chrome/browser/chromeos/update_browsertest.cc

Issue 7532034: Move in_process_browser_test and ui_test_utils to chrome/test/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/memory/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/chromeos/cros/mock_update_library.h" 7 #include "chrome/browser/chromeos/cros/mock_update_library.h"
8 #include "chrome/browser/chromeos/update_observer.h" 8 #include "chrome/browser/chromeos/update_observer.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "chrome/test/automation/dom_element_proxy.h" 12 #include "chrome/test/automation/dom_element_proxy.h"
13 #include "chrome/test/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
15 15
16 using ::testing::AnyNumber; 16 using ::testing::AnyNumber;
17 using ::testing::InvokeWithoutArgs; 17 using ::testing::InvokeWithoutArgs;
18 using ::testing::Return; 18 using ::testing::Return;
19 using ::testing::ReturnRef; 19 using ::testing::ReturnRef;
20 using ::testing::_; 20 using ::testing::_;
21 using ::testing::Invoke; 21 using ::testing::Invoke;
22 using ::testing::Exactly; 22 using ::testing::Exactly;
23 23
24 namespace { 24 namespace {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 chromeos::UpdateObserver* observe = 111 chromeos::UpdateObserver* observe =
112 new chromeos::UpdateObserver(browser()->profile()); 112 new chromeos::UpdateObserver(browser()->profile());
113 lib->AddObserver(observe); 113 lib->AddObserver(observe);
114 114
115 FireSuccessSequence(lib.get(), &observers); 115 FireSuccessSequence(lib.get(), &observers);
116 FireFailureSequence(lib.get(), &observers); 116 FireFailureSequence(lib.get(), &observers);
117 } 117 }
118 118
119 } // namespace 119 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698