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

Side by Side Diff: chrome/browser/task_profiler/task_profiler_data_serializer_unittest.cc

Issue 19631004: Update include paths in chrome/browser/ for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT Created 7 years, 5 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/process_util.h" 9 #include "base/process/process_handle.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/tracked_objects.h" 11 #include "base/tracked_objects.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/task_profiler/task_profiler_data_serializer.h" 13 #include "chrome/browser/task_profiler/task_profiler_data_serializer.h"
14 #include "content/public/common/process_type.h" 14 #include "content/public/common/process_type.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace { 17 namespace {
18 18
19 std::string GetProcessIdString() { 19 std::string GetProcessIdString() {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 "\"run_ms_max\":205," 152 "\"run_ms_max\":205,"
153 "\"run_ms_sample\":203" 153 "\"run_ms_sample\":203"
154 "}," 154 "},"
155 "\"death_thread\":\"PAC thread #3\"" 155 "\"death_thread\":\"PAC thread #3\""
156 "}]," 156 "}],"
157 "\"process_id\":" + GetProcessIdString() + "," 157 "\"process_id\":" + GetProcessIdString() + ","
158 "\"process_type\":\"Tab\"" 158 "\"process_type\":\"Tab\""
159 "}"); 159 "}");
160 } 160 }
161 } 161 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_unittest.cc ('k') | chrome/browser/ui/app_list/app_list_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698